https://github.com/martinboehme created
https://github.com/llvm/llvm-project/pull/88872
This patch adds a test that assert-fails without the fix.
>From b2df2208aaee019279afe362ff538e97d59497dd Mon Sep 17 00:00:00 2001
From: Martin Braenne <mboe...@google.com>
Date: Tue, 16 Apr 2024 11:03:47 +0000
Subject: [PATCH] [clang][dataflow] Support `StmtExpr` in
`PropagateResultObject()`.
This patch adds a test that assert-fails without the fix.
---
.../FlowSensitive/DataflowEnvironment.cpp | 5 ++++
.../Analysis/FlowSensitive/TransferTest.cpp | 26 +++++++++++++++++++
2 files changed, 31 insertions(+)
diff --git a/clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
b/clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
index ee2581143e1141..6974c195d42f6c 100644
--- a/clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
+++ b/clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
@@ -556,6 +556,11 @@ class ResultObjectVisitor : public
RecursiveASTVisitor<ResultObjectVisitor> {
return;
}
+ if (auto *SE = dyn_cast<StmtExpr>(E)) {
+ PropagateResultObject(cast<Expr>(SE->getSubStmt()->body_back()), Loc);
+ return;
+ }
+
// All other expression nodes that propagate a record prvalue should have
// exactly one child.
SmallVector<Stmt *, 1> Children(E->child_begin(), E->child_end());
diff --git a/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp
b/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp
index d8bcc3da4b8b1c..d7a51b009712f6 100644
--- a/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp
+++ b/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp
@@ -3182,6 +3182,32 @@ TEST(TransferTest,
ResultObjectLocationForStdInitializerListExpr) {
});
}
+TEST(TransferTest, ResultObjectLocationForStmtExpr) {
+ std::string Code = R"(
+ struct S {};
+ void target() {
+ S s = ({ S(); });
+ // [[p]]
+ }
+ )";
+ using ast_matchers::cxxConstructExpr;
+ using ast_matchers::match;
+ using ast_matchers::selectFirst;
+ using ast_matchers::traverse;
+ runDataflow(
+ Code,
+ [](const llvm::StringMap<DataflowAnalysisState<NoopLattice>> &Results,
+ ASTContext &ASTCtx) {
+ const Environment &Env = getEnvironmentAtAnnotation(Results, "p");
+
+ auto *Construct = selectFirst<CXXConstructExpr>(
+ "construct", match(cxxConstructExpr().bind("construct"), ASTCtx));
+
+ EXPECT_EQ(&Env.getResultObjectLocation(*Construct),
+ &getLocForDecl<RecordStorageLocation>(ASTCtx, Env, "s"));
+ });
+}
+
TEST(TransferTest, ResultObjectLocationPropagatesThroughConditionalOperator) {
std::string Code = R"(
struct A {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
