diff options
author | Samira Bazuzi <bazuzi@google.com> | 2024-07-22 10:22:23 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-22 10:22:23 -0400 |
commit | 83c2bfdacb0593b3a72e93098a55afdcd93d865f (patch) | |
tree | 38c9caee9b7ec63ff4f7c8bf933867047ba847ec | |
parent | 32cd18975d2e1de5a783e9b1c3c21a234d5723b4 (diff) | |
download | llvm-83c2bfdacb0593b3a72e93098a55afdcd93d865f.zip llvm-83c2bfdacb0593b3a72e93098a55afdcd93d865f.tar.gz llvm-83c2bfdacb0593b3a72e93098a55afdcd93d865f.tar.bz2 |
[clang][dataflow] Handle this-capturing lambdas in field initializers. (#99519)
We previously would assume these lambdas appeared inside a method
definition and end up crashing.
-rw-r--r-- | clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp | 21 | ||||
-rw-r--r-- | clang/unittests/Analysis/FlowSensitive/DataflowEnvironmentTest.cpp | 28 |
2 files changed, 43 insertions, 6 deletions
diff --git a/clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp b/clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp index f734168..8d7fe18 100644 --- a/clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp +++ b/clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp @@ -524,12 +524,21 @@ void Environment::initialize() { assert(VarDecl != nullptr); setStorageLocation(*VarDecl, createObject(*VarDecl, nullptr)); } else if (Capture.capturesThis()) { - const auto *SurroundingMethodDecl = - cast<CXXMethodDecl>(InitialTargetFunc->getNonClosureAncestor()); - QualType ThisPointeeType = - SurroundingMethodDecl->getFunctionObjectParameterType(); - setThisPointeeStorageLocation( - cast<RecordStorageLocation>(createObject(ThisPointeeType))); + if (auto *Ancestor = InitialTargetFunc->getNonClosureAncestor()) { + const auto *SurroundingMethodDecl = cast<CXXMethodDecl>(Ancestor); + QualType ThisPointeeType = + SurroundingMethodDecl->getFunctionObjectParameterType(); + setThisPointeeStorageLocation( + cast<RecordStorageLocation>(createObject(ThisPointeeType))); + } else if (auto *FieldBeingInitialized = + dyn_cast<FieldDecl>(Parent->getLambdaContextDecl())) { + // This is in a field initializer, rather than a method. + setThisPointeeStorageLocation( + cast<RecordStorageLocation>(createObject(QualType( + FieldBeingInitialized->getParent()->getTypeForDecl(), 0)))); + } else { + assert(false && "Unexpected this-capturing lambda context."); + } } } } else if (MethodDecl->isImplicitObjectMemberFunction()) { diff --git a/clang/unittests/Analysis/FlowSensitive/DataflowEnvironmentTest.cpp b/clang/unittests/Analysis/FlowSensitive/DataflowEnvironmentTest.cpp index a4ac597..41fca6b 100644 --- a/clang/unittests/Analysis/FlowSensitive/DataflowEnvironmentTest.cpp +++ b/clang/unittests/Analysis/FlowSensitive/DataflowEnvironmentTest.cpp @@ -473,4 +473,32 @@ TEST_F(EnvironmentTest, Stmt) { Env.getResultObjectLocation(*Init); } +// This is a crash repro. +TEST_F(EnvironmentTest, LambdaCapturingThisInFieldInitializer) { + using namespace ast_matchers; + std::string Code = R"cc( + struct S { + int f{[this]() { return 1; }()}; + }; + )cc"; + + auto Unit = + tooling::buildASTFromCodeWithArgs(Code, {"-fsyntax-only", "-std=c++11"}); + auto &Context = Unit->getASTContext(); + + ASSERT_EQ(Context.getDiagnostics().getClient()->getNumErrors(), 0U); + + auto *LambdaCallOperator = selectFirst<CXXMethodDecl>( + "method", match(cxxMethodDecl(hasName("operator()"), + ofClass(cxxRecordDecl(isLambda()))) + .bind("method"), + Context)); + + Environment Env(DAContext, *LambdaCallOperator); + // Don't crash when initializing. + Env.initialize(); + // And initialize the captured `this` pointee. + ASSERT_NE(nullptr, Env.getThisPointeeStorageLocation()); +} + } // namespace |