Author: martinboehme Date: 2024-01-22T09:23:06+01:00 New Revision: a2caa4929e8e8a2ffff4ee5f03ab37a9be7462a0
URL: https://github.com/llvm/llvm-project/commit/a2caa4929e8e8a2ffff4ee5f03ab37a9be7462a0 DIFF: https://github.com/llvm/llvm-project/commit/a2caa4929e8e8a2ffff4ee5f03ab37a9be7462a0.diff LOG: [clang][dataflow] Treat comma operator correctly in `getResultObjectLocation()`. (#78427) Added: Modified: clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp clang/unittests/Analysis/FlowSensitive/TransferTest.cpp Removed: ################################################################################ diff --git a/clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp b/clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp index 07dc3a9f76ac23..196a1360a7750a 100644 --- a/clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp +++ b/clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp @@ -782,8 +782,13 @@ Environment::getResultObjectLocation(const Expr &RecordPRValue) const { return Val->getLoc(); } - // Expression nodes that propagate a record prvalue should have exactly one - // child. + if (auto *Op = dyn_cast<BinaryOperator>(&RecordPRValue); + Op && Op->isCommaOp()) { + return getResultObjectLocation(*Op->getRHS()); + } + + // All other expression nodes that propagate a record prvalue should have + // exactly one child. llvm::SmallVector<const Stmt *> children(RecordPRValue.child_begin(), RecordPRValue.child_end()); assert(children.size() == 1); diff --git a/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp b/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp index d0a0e6d3f58364..85ae24f0b6f165 100644 --- a/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp +++ b/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp @@ -2642,14 +2642,17 @@ TEST(TransferTest, ResultObjectLocation) { }; void target() { - A(); + 0, A(); (void)0; // [[p]] } )"; + using ast_matchers::binaryOperator; using ast_matchers::cxxBindTemporaryExpr; using ast_matchers::cxxTemporaryObjectExpr; using ast_matchers::exprWithCleanups; using ast_matchers::has; + using ast_matchers::hasOperatorName; + using ast_matchers::hasRHS; using ast_matchers::match; using ast_matchers::selectFirst; using ast_matchers::traverse; @@ -2659,26 +2662,33 @@ TEST(TransferTest, ResultObjectLocation) { ASTContext &ASTCtx) { const Environment &Env = getEnvironmentAtAnnotation(Results, "p"); - // The expresssion `A()` in the code above produces the following - // structure, consisting of three prvalues of record type. + // The expression `0, A()` in the code above produces the following + // structure, consisting of four prvalues of record type. // `Env.getResultObjectLocation()` should return the same location for // all of these. auto MatchResult = match( traverse(TK_AsIs, exprWithCleanups( - has(cxxBindTemporaryExpr( - has(cxxTemporaryObjectExpr().bind("toe"))) - .bind("bte"))) + has(binaryOperator( + hasOperatorName(","), + hasRHS(cxxBindTemporaryExpr( + has(cxxTemporaryObjectExpr().bind( + "toe"))) + .bind("bte"))) + .bind("comma"))) .bind("ewc")), ASTCtx); auto *TOE = selectFirst<CXXTemporaryObjectExpr>("toe", MatchResult); ASSERT_NE(TOE, nullptr); + auto *Comma = selectFirst<BinaryOperator>("comma", MatchResult); + ASSERT_NE(Comma, nullptr); auto *EWC = selectFirst<ExprWithCleanups>("ewc", MatchResult); ASSERT_NE(EWC, nullptr); auto *BTE = selectFirst<CXXBindTemporaryExpr>("bte", MatchResult); ASSERT_NE(BTE, nullptr); RecordStorageLocation &Loc = Env.getResultObjectLocation(*TOE); + EXPECT_EQ(&Loc, &Env.getResultObjectLocation(*Comma)); EXPECT_EQ(&Loc, &Env.getResultObjectLocation(*EWC)); EXPECT_EQ(&Loc, &Env.getResultObjectLocation(*BTE)); }); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
