[cfe-commits] r70514 - in /cfe/trunk: include/clang/Basic/DiagnosticSemaKinds.td lib/Sema/SemaDeclObjC.cpp test/SemaObjC/ivar-sem-check-2.m

[Fariborz Jahanian]

Author: fjahanian
Date: Thu Apr 30 16:39:24 2009
New Revision: 70514

URL: http://llvm.org/viewvc/llvm-project?rev=70514&view=rev
Log:
Use of super class ivar to synthesize property is back to being error.


Modified:
    cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
    cfe/trunk/lib/Sema/SemaDeclObjC.cpp
    cfe/trunk/test/SemaObjC/ivar-sem-check-2.m

Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=70514&r1=70513&r2=70514&view=diff

==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Thu Apr 30 16:39:24 2009
@@ -220,7 +220,7 @@
 
 def error_property_ivar_type : Error<
   "type of property %0 does not match type of ivar %1">;
-def warn_ivar_in_superclass_use : Warning<
+def error_ivar_in_superclass_use : Error<
   "property %0 attempting to use ivar %1 declared in super class %2">;
 def error_weak_property : Error<
   "existing ivar %1 for __weak property %0 must be __weak">;

Modified: cfe/trunk/lib/Sema/SemaDeclObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclObjC.cpp?rev=70514&r1=70513&r2=70514&view=diff

==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclObjC.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclObjC.cpp Thu Apr 30 16:39:24 2009
@@ -1918,7 +1918,7 @@
     }
     else if (getLangOptions().ObjCNonFragileABI &&
              ClassDeclared != IDecl) {
-      Diag(PropertyLoc, diag::warn_ivar_in_superclass_use)
+      Diag(PropertyLoc, diag::error_ivar_in_superclass_use)
         << property->getDeclName() << Ivar->getDeclName() 
         << ClassDeclared->getDeclName();
       Diag(Ivar->getLocation(), diag::note_previous_access_declaration)

Modified: cfe/trunk/test/SemaObjC/ivar-sem-check-2.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/ivar-sem-check-2.m?rev=70514&r1=70513&r2=70514&view=diff

==============================================================================
--- cfe/trunk/test/SemaObjC/ivar-sem-check-2.m (original)
+++ cfe/trunk/test/SemaObjC/ivar-sem-check-2.m Thu Apr 30 16:39:24 2009
@@ -17,7 +17,7 @@
 @implementation Sub
 @synthesize value; // expected-note {{previous use is here}}
 @synthesize value1=value; // expected-error {{synthesized properties 'value1' and 'value' both claim ivar 'value'}} 
- at synthesize prop=value2;  // expected-warning {{property 'prop' attempting to use ivar 'value2' declared in super class 'Super'}}
+ at synthesize prop=value2;  // expected-error {{property 'prop' attempting to use ivar 'value2' declared in super class 'Super'}}
 @end