Author: Martin Braenne Date: 2023-06-28T09:12:03Z New Revision: d04b198973c9bda2376209b460943ac393190752
URL: https://github.com/llvm/llvm-project/commit/d04b198973c9bda2376209b460943ac393190752 DIFF: https://github.com/llvm/llvm-project/commit/d04b198973c9bda2376209b460943ac393190752.diff LOG: [clang][dataflow] Add a test that we can access fields of anonymous records. Reviewed By: sammccall, ymandel, gribozavr2, xazax.hun Differential Revision: https://reviews.llvm.org/D153409 Added: Modified: clang/unittests/Analysis/FlowSensitive/TestingSupport.cpp clang/unittests/Analysis/FlowSensitive/TestingSupport.h clang/unittests/Analysis/FlowSensitive/TransferTest.cpp Removed: ################################################################################ diff --git a/clang/unittests/Analysis/FlowSensitive/TestingSupport.cpp b/clang/unittests/Analysis/FlowSensitive/TestingSupport.cpp index 0d441b71e69c6..a88b8d88c74c0 100644 --- a/clang/unittests/Analysis/FlowSensitive/TestingSupport.cpp +++ b/clang/unittests/Analysis/FlowSensitive/TestingSupport.cpp @@ -154,9 +154,19 @@ test::buildStatementToAnnotationMapping(const FunctionDecl *Func, } const ValueDecl *test::findValueDecl(ASTContext &ASTCtx, llvm::StringRef Name) { - auto TargetNodes = match(valueDecl(hasName(Name)).bind("v"), ASTCtx); + auto TargetNodes = match( + valueDecl(unless(indirectFieldDecl()), hasName(Name)).bind("v"), ASTCtx); assert(TargetNodes.size() == 1 && "Name must be unique"); auto *const Result = selectFirst<ValueDecl>("v", TargetNodes); assert(Result != nullptr); return Result; } + +const IndirectFieldDecl *test::findIndirectFieldDecl(ASTContext &ASTCtx, + llvm::StringRef Name) { + auto TargetNodes = match(indirectFieldDecl(hasName(Name)).bind("i"), ASTCtx); + assert(TargetNodes.size() == 1 && "Name must be unique"); + const auto *Result = selectFirst<IndirectFieldDecl>("i", TargetNodes); + assert(Result != nullptr); + return Result; +} diff --git a/clang/unittests/Analysis/FlowSensitive/TestingSupport.h b/clang/unittests/Analysis/FlowSensitive/TestingSupport.h index e22600d7b2e44..856737d034855 100644 --- a/clang/unittests/Analysis/FlowSensitive/TestingSupport.h +++ b/clang/unittests/Analysis/FlowSensitive/TestingSupport.h @@ -428,6 +428,14 @@ runDataflowReturnError(llvm::StringRef Code, VerifyResultsT VerifyResults, /// `Name` must be unique in `ASTCtx`. const ValueDecl *findValueDecl(ASTContext &ASTCtx, llvm::StringRef Name); +/// Returns the `IndirectFieldDecl` for the given identifier. +/// +/// Requirements: +/// +/// `Name` must be unique in `ASTCtx`. +const IndirectFieldDecl *findIndirectFieldDecl(ASTContext &ASTCtx, + llvm::StringRef Name); + /// Returns the storage location (of type `LocT`) for the given identifier. /// `LocT` must be a subclass of `StorageLocation` and must be of the /// appropriate type. diff --git a/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp b/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp index 5e7abcc6ce750..51550adeea894 100644 --- a/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp +++ b/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp @@ -5434,4 +5434,38 @@ TEST(TransferTest, BuiltinFunctionModeled) { }); } +// Check that fields of anonymous records are modeled. +TEST(TransferTest, AnonymousStruct) { + std::string Code = R"( + struct S { + struct { + bool b; + }; + }; + void target() { + S s; + s.b = true; + // [[p]] + } + )"; + runDataflow( + Code, + [](const llvm::StringMap<DataflowAnalysisState<NoopLattice>> &Results, + ASTContext &ASTCtx) { + const Environment &Env = getEnvironmentAtAnnotation(Results, "p"); + const ValueDecl *SDecl = findValueDecl(ASTCtx, "s"); + const ValueDecl *BDecl = findValueDecl(ASTCtx, "b"); + const IndirectFieldDecl *IndirectField = + findIndirectFieldDecl(ASTCtx, "b"); + + auto *S = + cast<AggregateStorageLocation>(Env.getStorageLocation(*SDecl)); + auto &AnonStruct = cast<AggregateStorageLocation>( + S->getChild(*cast<ValueDecl>(IndirectField->chain().front()))); + + auto *B = cast<BoolValue>(Env.getValue(AnonStruct.getChild(*BDecl))); + ASSERT_TRUE(Env.flowConditionImplies(*B)); + }); +} + } // namespace _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
