commit 13546a871db44c707001f507a9edfd0d5bcc81b4
author Fariborz Jahanian <fjahanian@apple.com> Wed Oct 12 00:00:57 2011 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Wed Oct 12 00:00:57 2011 +0000
tree 85e788bff13be001513ca136370a8c0526e506de
parent 6dbba4fc128e2e2f5b26be996392bd32c0707f13

objc: note location of the previously declared
property in the diagnostic.


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

lib/Sema/SemaObjCProperty.cpp

diff --git a/lib/Sema/SemaObjCProperty.cpp b/lib/Sema/SemaObjCProperty.cpp
index df95396..063b4ab 100644
--- a/lib/Sema/SemaObjCProperty.cpp
+++ b/lib/Sema/SemaObjCProperty.cpp
@@ -936,9 +936,11 @@
     QualType ConvertedType;
     if (!isObjCPointerConversion(RHSType, LHSType, 
                                  ConvertedType, IncompatibleObjC) ||
-        IncompatibleObjC)
+        IncompatibleObjC) {
         Diag(Property->getLocation(), diag::warn_property_types_are_incompatible)
         << Property->getType() << SuperProperty->getType() << inheritedName;
+      Diag(SuperProperty->getLocation(), diag::note_property_declare);
+    }
   }
 }