[llvm-branch-commits] [cfe-branch] r121552 - in /cfe/branches/Apple/whitney: include/clang/Basic/DiagnosticSemaKinds.td test/SemaObjC/error-property-gc-attr.m

[Daniel Dunbar]

Author: ddunbar
Date: Fri Dec 10 15:37:44 2010
New Revision: 121552

URL: http://llvm.org/viewvc/llvm-project?rev=121552&view=rev
Log:
Merge r120737:
--
Author: Fariborz Jahanian <fjahanian at apple.com>
Date:   Thu Dec 2 21:00:16 2010 +0000

    Improve on objc diagnostics. // rdar://8721692

Modified:
    cfe/branches/Apple/whitney/include/clang/Basic/DiagnosticSemaKinds.td
    cfe/branches/Apple/whitney/test/SemaObjC/error-property-gc-attr.m

Modified: cfe/branches/Apple/whitney/include/clang/Basic/DiagnosticSemaKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/include/clang/Basic/DiagnosticSemaKinds.td?rev=121552&r1=121551&r2=121552&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/include/clang/Basic/DiagnosticSemaKinds.td (original)
+++ cfe/branches/Apple/whitney/include/clang/Basic/DiagnosticSemaKinds.td Fri Dec 10 15:37:44 2010
@@ -416,7 +416,7 @@
 def error_weak_property : Error<
   "existing ivar %1 for __weak property %0 must be __weak">;
 def error_strong_property : Error<
-  "existing ivar %1 for a __strong property %0 must be garbage collectable">;
+  "property %0 must be declared __weak to match existing ivar %1 with __weak attribute">;
 def error_dynamic_property_ivar_decl : Error<
   "dynamic property can not have ivar specification">;
 def error_duplicate_ivar_use : Error<

Modified: cfe/branches/Apple/whitney/test/SemaObjC/error-property-gc-attr.m
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/test/SemaObjC/error-property-gc-attr.m?rev=121552&r1=121551&r2=121552&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/test/SemaObjC/error-property-gc-attr.m (original)
+++ cfe/branches/Apple/whitney/test/SemaObjC/error-property-gc-attr.m Fri Dec 10 15:37:44 2010
@@ -20,9 +20,9 @@
 
 @implementation INTF
 @synthesize pweak=IVAR;  // expected-error {{existing ivar 'IVAR' for __weak property 'pweak' must be __weak}}
- at synthesize NOT=II; // expected-error {{existing ivar 'II' for a __strong property 'NOT' must be garbage collectable}}
+ at synthesize NOT=II; // expected-error {{property 'NOT' must be declared __weak to match existing ivar 'II' with __weak attribute}}
 @synthesize WID;
 @synthesize ID;
- at synthesize AWEAK; // expected-error {{existing ivar 'AWEAK' for a __strong property 'AWEAK' must be garbage collectable}}
+ at synthesize AWEAK; // expected-error {{property 'AWEAK' must be declared __weak to match existing ivar 'AWEAK' with __weak attribute}}
 @synthesize WI;
 @end