https://github.com/martinboehme updated
https://github.com/llvm/llvm-project/pull/85072
>From 7c61dc4872a1ffba8c241aa92bd87863f585e301 Mon Sep 17 00:00:00 2001
From: Martin Braenne <mboe...@google.com>
Date: Thu, 14 Mar 2024 08:46:06 +0000
Subject: [PATCH] [clang][dataflow] Fix `getResultObjectLocation()` on
`CXXDefaultArgExpr`.
This patch includes a test that causes an assertion failure without the other
changes in this patch.
---
.../FlowSensitive/DataflowEnvironment.cpp | 1 +
clang/lib/Analysis/FlowSensitive/Transfer.cpp | 6 ++++
.../Analysis/FlowSensitive/TransferTest.cpp | 30 +++++++++++++++++++
3 files changed, 37 insertions(+)
diff --git a/clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
b/clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
index 1d2bd9a9b08af3..cc1ebd511191a9 100644
--- a/clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
+++ b/clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
@@ -771,6 +771,7 @@ static bool isOriginalRecordConstructor(const Expr
&RecordPRValue) {
return !Init->isSemanticForm() || !Init->isTransparent();
return isa<CXXConstructExpr>(RecordPRValue) || isa<CallExpr>(RecordPRValue)
||
isa<LambdaExpr>(RecordPRValue) ||
+ isa<CXXDefaultArgExpr>(RecordPRValue) ||
isa<CXXDefaultInitExpr>(RecordPRValue) ||
// The framework currently does not propagate the objects created in
// the two branches of a `ConditionalOperator` because there is no way
diff --git a/clang/lib/Analysis/FlowSensitive/Transfer.cpp
b/clang/lib/Analysis/FlowSensitive/Transfer.cpp
index 04aa2831df0558..ea166fcdb89e20 100644
--- a/clang/lib/Analysis/FlowSensitive/Transfer.cpp
+++ b/clang/lib/Analysis/FlowSensitive/Transfer.cpp
@@ -450,6 +450,12 @@ class TransferVisitor : public
ConstStmtVisitor<TransferVisitor> {
Env.setStorageLocation(*S, *MemberLoc);
}
+ void VisitCXXDefaultArgExpr(const CXXDefaultArgExpr *S) {
+ const Expr *ArgExpr = S->getExpr();
+ assert(ArgExpr != nullptr);
+ propagateValueOrStorageLocation(*ArgExpr, *S, Env);
+ }
+
void VisitCXXDefaultInitExpr(const CXXDefaultInitExpr *S) {
const Expr *InitExpr = S->getExpr();
assert(InitExpr != nullptr);
diff --git a/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp
b/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp
index a8c282f140b4cd..86c7f32f0104be 100644
--- a/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp
+++ b/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp
@@ -2924,6 +2924,36 @@ TEST(TransferTest, ResultObjectLocation) {
});
}
+TEST(TransferTest, ResultObjectLocationForDefaultArgExpr) {
+ std::string Code = R"(
+ struct S {};
+ void funcWithDefaultArg(S s = S());
+ void target() {
+ funcWithDefaultArg();
+ // [[p]]
+ }
+ )";
+
+ using ast_matchers::cxxDefaultArgExpr;
+ using ast_matchers::match;
+ using ast_matchers::selectFirst;
+ runDataflow(
+ Code,
+ [](const llvm::StringMap<DataflowAnalysisState<NoopLattice>> &Results,
+ ASTContext &ASTCtx) {
+ const Environment &Env = getEnvironmentAtAnnotation(Results, "p");
+
+ auto *DefaultArg = selectFirst<CXXDefaultArgExpr>(
+ "default_arg",
+ match(cxxDefaultArgExpr().bind("default_arg"), ASTCtx));
+ ASSERT_NE(DefaultArg, nullptr);
+
+ // The values for default arguments aren't modeled; we merely verify
+ // that we can get a result object location for a default arg.
+ Env.getResultObjectLocation(*DefaultArg);
+ });
+}
+
TEST(TransferTest, ResultObjectLocationForDefaultInitExpr) {
std::string Code = R"(
struct S {};
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
