Fix a couple of wrong self-comparison diagnostics.

Check whether we are comparing the same entity, not merely the same
declaration, and don't assume that weak declarations resolve to distinct
entities.

llvm-svn: 321976

1 files changed, 4 insertions, 4 deletions

diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index 933289360b2..e9e65fc1fc5 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/lib/Sema/SemaExpr.cpp
@@ -9627,7 +9627,8 @@ static void diagnoseTautologicalComparison(Sema &S, SourceLocation Loc,
   // result.
   ValueDecl *DL = getCompareDecl(LHSStripped);
   ValueDecl *DR = getCompareDecl(RHSStripped);
-  if (DL && DR && DL == DR && !IsWithinTemplateSpecialization(DL)) {
+  if (DL && DR && declaresSameEntity(DL, DR) &&
+      !IsWithinTemplateSpecialization(DL)) {
     StringRef Result;
     switch (Opc) {
     case BO_EQ: case BO_LE: case BO_GE:
@@ -9648,10 +9649,9 @@ static void diagnoseTautologicalComparison(Sema &S, SourceLocation Loc,
                               << Result);
   } else if (DL && DR && LHSType->isArrayType() && RHSType->isArrayType() &&
              !DL->getType()->isReferenceType() &&
-             !DR->getType()->isReferenceType()) {
+             !DR->getType()->isReferenceType() &&
+             !DL->isWeak() && !DR->isWeak()) {
     // What is it always going to evaluate to?
-    // FIXME: This is wrong if DL and DR are different Decls for the same
-    // entity. It's also wrong if DL and/or DR are weak declarations.
     StringRef Result;
     switch(Opc) {
     case BO_EQ: // e.g. array1 == array2