This revision was automatically updated to reflect the committed changes.
Closed by commit rG0b12efc7a42c: [clang][dataflow] Add support for nested
method calls. (authored by ymandel).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D134432/new/
https://reviews.llvm.org/D134432
Files:
clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
clang/unittests/Analysis/FlowSensitive/TransferTest.cpp
Index: clang/unittests/Analysis/FlowSensitive/TransferTest.cpp
===================================================================
--- clang/unittests/Analysis/FlowSensitive/TransferTest.cpp
+++ clang/unittests/Analysis/FlowSensitive/TransferTest.cpp
@@ -4359,7 +4359,7 @@
std::string Code = R"(
class MyClass {
public:
- bool setField(bool Val) { Field = Val; }
+ void setField(bool Val) { Field = Val; }
bool Field;
};
@@ -4392,7 +4392,7 @@
class MyClass {
public:
bool getField() { return Field; }
- bool setField(bool Val) { Field = Val; }
+ void setField(bool Val) { Field = Val; }
private:
bool Field;
@@ -4421,6 +4421,73 @@
{TransferOptions{ContextSensitiveOptions{}}});
}
+
+TEST(TransferTest, ContextSensitiveMethodTwoLayersVoid) {
+ std::string Code = R"(
+ class MyClass {
+ public:
+ void Inner() { MyField = true; }
+ void Outer() { Inner(); }
+
+ bool MyField;
+ };
+
+ void target() {
+ MyClass MyObj;
+ MyObj.Outer();
+ bool Foo = MyObj.MyField;
+ // [[p]]
+ }
+ )";
+ runDataflow(
+ Code,
+ [](const llvm::StringMap<DataflowAnalysisState<NoopLattice>> &Results,
+ ASTContext &ASTCtx) {
+ ASSERT_THAT(Results.keys(), UnorderedElementsAre("p"));;
+ const Environment &Env = getEnvironmentAtAnnotation(Results, "p");
+
+ const ValueDecl *FooDecl = findValueDecl(ASTCtx, "Foo");
+ ASSERT_THAT(FooDecl, NotNull());
+
+ auto &FooVal = *cast<BoolValue>(Env.getValue(*FooDecl, SkipPast::None));
+ EXPECT_TRUE(Env.flowConditionImplies(FooVal));
+ },
+ {TransferOptions{ContextSensitiveOptions{}}});
+}
+
+TEST(TransferTest, ContextSensitiveMethodTwoLayersReturn) {
+ std::string Code = R"(
+ class MyClass {
+ public:
+ bool Inner() { return MyField; }
+ bool Outer() { return Inner(); }
+
+ bool MyField;
+ };
+
+ void target() {
+ MyClass MyObj;
+ MyObj.MyField = true;
+ bool Foo = MyObj.Outer();
+ // [[p]]
+ }
+ )";
+ runDataflow(
+ Code,
+ [](const llvm::StringMap<DataflowAnalysisState<NoopLattice>> &Results,
+ ASTContext &ASTCtx) {
+ ASSERT_THAT(Results.keys(), UnorderedElementsAre("p"));;
+ const Environment &Env = getEnvironmentAtAnnotation(Results, "p");
+
+ const ValueDecl *FooDecl = findValueDecl(ASTCtx, "Foo");
+ ASSERT_THAT(FooDecl, NotNull());
+
+ auto &FooVal = *cast<BoolValue>(Env.getValue(*FooDecl, SkipPast::None));
+ EXPECT_TRUE(Env.flowConditionImplies(FooVal));
+ },
+ {TransferOptions{ContextSensitiveOptions{}}});
+}
+
TEST(TransferTest, ContextSensitiveConstructorBody) {
std::string Code = R"(
class MyClass {
Index: clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
===================================================================
--- clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
+++ clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
@@ -216,7 +216,10 @@
if (const auto *MethodCall = dyn_cast<CXXMemberCallExpr>(Call)) {
if (const Expr *Arg = MethodCall->getImplicitObjectArgument()) {
- Env.ThisPointeeLoc = getStorageLocation(*Arg, SkipPast::Reference);
+ if (!isa<CXXThisExpr>(Arg))
+ Env.ThisPointeeLoc = getStorageLocation(*Arg, SkipPast::Reference);
+ // Otherwise (when the argument is `this`), retain the current
+ // environment's `ThisPointeeLoc`.
}
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
