commit 9414449e299036efbd411d92266983dfc24e24e9
author Fariborz Jahanian <fjahanian@apple.com> Fri Aug 26 21:21:19 2011 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Fri Aug 26 21:21:19 2011 +0000
tree f66dd17c76cda39c0b16538d8c1d4c454cf085fa
parent cec52f0623d57f090e3477941acebe4932fa7abd

objc-arc: Mention property's attribute by name when
finding life-time conflict with its declared ivar.
// rdar://10007230


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

lib/Sema/SemaObjCProperty.cpp

diff --git a/lib/Sema/SemaObjCProperty.cpp b/lib/Sema/SemaObjCProperty.cpp
index 46f6456..4b9cd66 100644
--- a/lib/Sema/SemaObjCProperty.cpp
+++ b/lib/Sema/SemaObjCProperty.cpp
@@ -487,7 +487,9 @@
     case Qualifiers::OCL_Strong:
       S.Diag(propertyImplLoc, diag::err_arc_assign_property_ownership)
         << property->getDeclName()
-        << ivar->getDeclName();
+        << ivar->getDeclName()
+        << ((property->getPropertyAttributesAsWritten() 
+            & ObjCPropertyDecl::OBJC_PR_assign) != 0);
       break;
     }