[clang] [clang][dataflow] Fix bug in `Value` comparison. (PR #76746)
Yitzhak Mandelbaum via cfe-commits
cfe-commits at lists.llvm.org
Wed Jan 10 10:30:45 PST 2024
https://github.com/ymand updated https://github.com/llvm/llvm-project/pull/76746
>From 3524e2bc42aa6f83a8ecb3ad892d4a7a33f31f03 Mon Sep 17 00:00:00 2001
From: Yitzhak Mandelbaum <yitzhakm at google.com>
Date: Tue, 2 Jan 2024 19:27:21 +0000
Subject: [PATCH 1/2] [clang][dataflow] Fix bug in `Value` comparison.
Makes value equivalence require that the values have no properties, except in
the case of equivalence by pointer equality (if the pointers are equal, nothing
else is checked).
Fixes issue #76459.
---
clang/lib/Analysis/FlowSensitive/Value.cpp | 10 +++++++---
clang/unittests/Analysis/FlowSensitive/ValueTest.cpp | 4 ++--
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/clang/lib/Analysis/FlowSensitive/Value.cpp b/clang/lib/Analysis/FlowSensitive/Value.cpp
index 349f873f1e6c4d..a22156e79ec801 100644
--- a/clang/lib/Analysis/FlowSensitive/Value.cpp
+++ b/clang/lib/Analysis/FlowSensitive/Value.cpp
@@ -27,9 +27,13 @@ static bool areEquivalentIndirectionValues(const Value &Val1,
}
bool areEquivalentValues(const Value &Val1, const Value &Val2) {
- return &Val1 == &Val2 || (Val1.getKind() == Val2.getKind() &&
- (isa<TopBoolValue>(&Val1) ||
- areEquivalentIndirectionValues(Val1, Val2)));
+ // If values are distinct and have properties, we don't consider them equal,
+ // leaving equality up to the user model.
+ return &Val1 == &Val2 ||
+ (Val1.getKind() == Val2.getKind() &&
+ (Val1.properties().empty() && Val2.properties().empty()) &&
+ (isa<TopBoolValue>(&Val1) ||
+ areEquivalentIndirectionValues(Val1, Val2)));
}
raw_ostream &operator<<(raw_ostream &OS, const Value &Val) {
diff --git a/clang/unittests/Analysis/FlowSensitive/ValueTest.cpp b/clang/unittests/Analysis/FlowSensitive/ValueTest.cpp
index c5d18ba74c3ed6..2060b7eb264f74 100644
--- a/clang/unittests/Analysis/FlowSensitive/ValueTest.cpp
+++ b/clang/unittests/Analysis/FlowSensitive/ValueTest.cpp
@@ -53,8 +53,8 @@ TEST(ValueTest, EquivalentValuesWithDifferentPropsEquivalent) {
TopBoolValue V2(A.makeAtomRef(Atom(3)));
V1.setProperty("foo", Prop1);
V2.setProperty("bar", Prop2);
- EXPECT_TRUE(areEquivalentValues(V1, V2));
- EXPECT_TRUE(areEquivalentValues(V2, V1));
+ EXPECT_FALSE(areEquivalentValues(V1, V2));
+ EXPECT_FALSE(areEquivalentValues(V2, V1));
}
TEST(ValueTest, DifferentKindsNotEquivalent) {
>From b2a6821ea88f6ed3b38c6dca1e5c7aaeef4159a2 Mon Sep 17 00:00:00 2001
From: Yitzhak Mandelbaum <ymand at users.noreply.github.com>
Date: Wed, 10 Jan 2024 13:30:38 -0500
Subject: [PATCH 2/2] Update clang/lib/Analysis/FlowSensitive/Value.cpp
Co-authored-by: martinboehme <mboehme at google.com>
---
clang/lib/Analysis/FlowSensitive/Value.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/clang/lib/Analysis/FlowSensitive/Value.cpp b/clang/lib/Analysis/FlowSensitive/Value.cpp
index a22156e79ec801..fa86874af3f836 100644
--- a/clang/lib/Analysis/FlowSensitive/Value.cpp
+++ b/clang/lib/Analysis/FlowSensitive/Value.cpp
@@ -27,13 +27,13 @@ static bool areEquivalentIndirectionValues(const Value &Val1,
}
bool areEquivalentValues(const Value &Val1, const Value &Val2) {
+ if (&Val1 == &Val2) return true;
+ if (Val1.getKind() != Val2.getKind()) return false;
// If values are distinct and have properties, we don't consider them equal,
// leaving equality up to the user model.
- return &Val1 == &Val2 ||
- (Val1.getKind() == Val2.getKind() &&
- (Val1.properties().empty() && Val2.properties().empty()) &&
- (isa<TopBoolValue>(&Val1) ||
- areEquivalentIndirectionValues(Val1, Val2)));
+ if (!Val1.properties().empty() || !Val2.properties().empty()) return false;
+ if (isa<TopBoolValue>(&Val1)) return true;
+ return areEquivalentIndirectionValues(Val1, Val2);
}
raw_ostream &operator<<(raw_ostream &OS, const Value &Val) {
More information about the cfe-commits
mailing list