diff options
| -rw-r--r-- | lib/AST/Expr.cpp | 3 | ||||
| -rw-r--r-- | test/SemaCXX/self-comparison.cpp | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/AST/Expr.cpp b/lib/AST/Expr.cpp index b5fb7fafb0..c9394bba2d 100644 --- a/lib/AST/Expr.cpp +++ b/lib/AST/Expr.cpp @@ -3983,7 +3983,8 @@ bool Expr::isSameComparisonOperand(const Expr* E1, const Expr* E2) { const auto Integer1 = dyn_cast<IntegerLiteral>(Idx1); const auto Integer2 = dyn_cast<IntegerLiteral>(Idx2); if (Integer1 && Integer2) { - if (Integer1->getValue() != Integer2->getValue()) + if (!llvm::APInt::isSameValue(Integer1->getValue(), + Integer2->getValue())) return false; } else { if (!isSameComparisonOperand(Idx1, Idx2)) diff --git a/test/SemaCXX/self-comparison.cpp b/test/SemaCXX/self-comparison.cpp index 4ea16665f1..e20706a8b6 100644 --- a/test/SemaCXX/self-comparison.cpp +++ b/test/SemaCXX/self-comparison.cpp @@ -86,6 +86,7 @@ int struct_test(S s1, S s2, S *s3, T t) { return s3->field == s3->field; // expected-warning {{self-comparison always evaluates to true}} return s3->static_field == S::static_field; // expected-warning {{self-comparison always evaluates to true}} return s1.array[0] == s1.array[0]; // expected-warning {{self-comparison always evaluates to true}} + return s1.array[0] == s1.array[0ull]; // expected-warning {{self-comparison always evaluates to true}} return s1.array[I1] == s1.array[I1]; // expected-warning {{self-comparison always evaluates to true}} return s1.array[s2.array[0]] == s1.array[s2.array[0]]; // expected-warning {{self-comparison always evaluates to true}} return s3->array[t.field] == s3->array[t.field]; // expected-warning {{self-comparison always evaluates to true}} |