Update clang/lib/Analysis/FlowSensitive/Value.cpp

Co-authored-by: martinboehme <[email protected]>

Author: ymand

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) {