-
Notifications
You must be signed in to change notification settings - Fork 12.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[clang][dataflow] Don't propagate result objects in unevaluated contexts (reland #90438) #91172
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ted contexts (llvm#90438)" This reverts commit 2252c5c.
…nevaluated contexts (llvm#90438)"
|
@llvm/pr-subscribers-clang-analysis @llvm/pr-subscribers-clang Author: None (martinboehme) Changes
Full diff: https://github.com/llvm/llvm-project/pull/91172.diff 2 Files Affected:
diff --git a/clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp b/clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
index d79e734402892a..cb6c8b2ef1072b 100644
--- a/clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
+++ b/clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
@@ -350,6 +350,17 @@ class ResultObjectVisitor : public RecursiveASTVisitor<ResultObjectVisitor> {
return RecursiveASTVisitor<ResultObjectVisitor>::TraverseDecl(D);
}
+ // Don't traverse expressions in unevaluated contexts, as we don't model
+ // fields that are only used in these.
+ // Note: The operand of the `noexcept` operator is an unevaluated operand, but
+ // nevertheless it appears in the Clang CFG, so we don't exclude it here.
+ bool TraverseDecltypeTypeLoc(DecltypeTypeLoc) { return true; }
+ bool TraverseTypeOfExprTypeLoc(TypeOfExprTypeLoc) { return true; }
+ bool TraverseCXXTypeidExpr(CXXTypeidExpr *) { return true; }
+ bool TraverseUnaryExprOrTypeTraitExpr(UnaryExprOrTypeTraitExpr *) {
+ return true;
+ }
+
bool TraverseBindingDecl(BindingDecl *BD) {
// `RecursiveASTVisitor` doesn't traverse holding variables for
// `BindingDecl`s by itself, so we need to tell it to.
diff --git a/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp b/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp
index 0b441faa6c76da..6743e778a2ffeb 100644
--- a/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp
+++ b/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp
@@ -3400,6 +3400,60 @@ TEST(TransferTest, ResultObjectLocationDontVisitNestedRecordDecl) {
ASTContext &ASTCtx) {});
}
+TEST(TransferTest, ResultObjectLocationDontVisitUnevaluatedContexts) {
+ // This is a crash repro.
+ // We used to crash because when propagating result objects, we would visit
+ // unevaluated contexts, but we don't model fields used only in these.
+
+ auto testFunction = [](llvm::StringRef Code, llvm::StringRef TargetFun) {
+ runDataflow(
+ Code,
+ [](const llvm::StringMap<DataflowAnalysisState<NoopLattice>> &Results,
+ ASTContext &ASTCtx) {},
+ LangStandard::lang_gnucxx17,
+ /* ApplyBuiltinTransfer= */ true, TargetFun);
+ };
+
+ std::string Code = R"cc(
+ // Definitions needed for `typeid`.
+ namespace std {
+ class type_info {};
+ class bad_typeid {};
+ } // namespace std
+
+ struct S1 {};
+ struct S2 { S1 s1; };
+
+ // We test each type of unevaluated context from a different target
+ // function. Some types of unevaluated contexts may actually cause the
+ // field `s1` to be modeled, and we don't want this to "pollute" the tests
+ // for the other unevaluated contexts.
+ void decltypeTarget() {
+ decltype(S2{}) Dummy;
+ }
+ void typeofTarget() {
+ typeof(S2{}) Dummy;
+ }
+ void typeidTarget() {
+#if __has_feature(cxx_rtti)
+ typeid(S2{});
+#endif
+ }
+ void sizeofTarget() {
+ sizeof(S2{});
+ }
+ void noexceptTarget() {
+ noexcept(S2{});
+ }
+ )cc";
+
+ testFunction(Code, "decltypeTarget");
+ testFunction(Code, "typeofTarget");
+ testFunction(Code, "typeidTarget");
+ testFunction(Code, "sizeofTarget");
+ testFunction(Code, "noexceptTarget");
+}
+
TEST(TransferTest, StaticCast) {
std::string Code = R"(
void target(int Foo) {
|
|
CI failure (DataFlowSanitizer-x86_64 :: release_shadow_space.c) looks unrelated. |
ymand
approved these changes
May 6, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
clang:analysis
clang:dataflow
Clang Dataflow Analysis framework - https://clang.llvm.org/docs/DataFlowAnalysisIntro.html
clang
Clang issues not falling into any other category
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This relands #90348 with a fix for a buildbot failure caused by the test being run with
-fno-rtti.