commit 77297f0761d2009e25d5d709cdcb041229f3493c
author Richard Trieu <rtrieu@google.com> Sat Sep 21 04:18:54 2019 +0000
committer Richard Trieu <rtrieu@google.com> Sat Sep 21 04:18:54 2019 +0000
tree 435a48d505ce19f835b284e6792156b2f5388d81
parent 4c05de8c1d157f4b5e0091a52dbbcce7242ee485

Fix bad APInt compare.

APInt comparison require both to have the same bitwidth.  Since only the value
is needed, use the compare function APInt::isSameValue instead.

llvm-svn: 372454

clang/lib/AST/Expr.cpp

diff --git a/clang/lib/AST/Expr.cpp b/clang/lib/AST/Expr.cpp
index b5fb7fa..c9394bb 100644
--- a/clang/lib/AST/Expr.cpp
+++ b/clang/lib/AST/Expr.cpp
@@ -3983,7 +3983,8 @@
         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))

clang/test/SemaCXX/self-comparison.cpp

diff --git a/clang/test/SemaCXX/self-comparison.cpp b/clang/test/SemaCXX/self-comparison.cpp
index 4ea1666..e20706a 100644
--- a/clang/test/SemaCXX/self-comparison.cpp
+++ b/clang/test/SemaCXX/self-comparison.cpp
@@ -86,6 +86,7 @@
   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}}