improve the diagnostic for an erroneous objc ivar reference

from:

t.m:8:7: error: member reference is not to a structure or union
  pool->farm = 0;
      ^ ~~~~
to:

t.m:8:7: error: 'NSAutoreleasePool' has member named 'farm'
  pool->farm = 0;
  ~~~~^ ~~~~

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@53824 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Basic/DiagnosticKinds.def b/include/clang/Basic/DiagnosticKinds.def
index ee8e33439af4dd88c52fa3a20ae97537af2622c7..b17102dede19e57b7a953bd9edd46c3e3f4525a0 100644 (file)
--- a/include/clang/Basic/DiagnosticKinds.def
+++ b/include/clang/Basic/DiagnosticKinds.def
@@ -881,6 +881,8 @@ DIAG(err_typecheck_subscript_not_object, ERROR,
      "illegal subscript of non-object type '%0'")
 DIAG(err_typecheck_member_reference_structUnion, ERROR,
      "member reference is not to a structure or union")
+DIAG(err_typecheck_member_reference_ivar, ERROR,
+     "'%0' has member named '%1'")
 DIAG(err_typecheck_member_reference_arrow, ERROR,
      "member reference is not a pointer")
 DIAG(err_typecheck_incomplete_tag, ERROR,

diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index 7babcf9d4f551e21480411b788f74c37854b5b8f..b81e090f7fb08951c0fab1ea0468cd39e131d42d 100644 (file)
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -622,8 +622,9 @@ ActOnMemberReferenceExpr(ExprTy *Base, SourceLocation OpLoc,
     if (ObjCIvarDecl *IV = IFTy->getDecl()->lookupInstanceVariable(&Member))
       return new ObjCIvarRefExpr(IV, IV->getType(), MemberLoc, BaseExpr, 
                                  OpKind == tok::arrow);
-    return Diag(OpLoc, diag::err_typecheck_member_reference_structUnion,
-                SourceRange(MemberLoc));
+    return Diag(OpLoc, diag::err_typecheck_member_reference_ivar,
+                IFTy->getDecl()->getName(), Member.getName(),
+                BaseExpr->getSourceRange(), SourceRange(MemberLoc));
   }
   
   // Handle property access.