[cfe-commits] r62524 - in /cfe/trunk: lib/Sema/SemaDeclObjC.cpp test/SemaObjC/property-ivar-mismatch.m

[Fariborz Jahanian]

Author: fjahanian
Date: Mon Jan 19 14:13:47 2009
New Revision: 62524

URL: http://llvm.org/viewvc/llvm-project?rev=62524&view=rev
Log:
Type of property and its ivar is more restrictive
that rules for assignment.

Added:
    cfe/trunk/test/SemaObjC/property-ivar-mismatch.m
Modified:
    cfe/trunk/lib/Sema/SemaDeclObjC.cpp

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

==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclObjC.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclObjC.cpp Mon Jan 19 14:13:47 2009
@@ -1698,6 +1698,21 @@
           << property->getDeclName() << Ivar->getDeclName();
         return 0;
       }
+      else {
+        // FIXME! Rules for properties are somewhat different that those
+        // for assignments. Use a new routine to consolidate all cases;
+        // specifically for property redeclarations as well as for ivars.
+        QualType lhsType = 
+                    Context.getCanonicalType(PropType).getUnqualifiedType();
+        QualType rhsType = 
+                    Context.getCanonicalType(IvarType).getUnqualifiedType();
+        if (lhsType != rhsType && 
+            lhsType->isArithmeticType()) {
+          Diag(PropertyLoc, diag::error_property_ivar_type)
+          << property->getDeclName() << Ivar->getDeclName();
+          return 0;
+        }
+      }
     }
   } else if (PropertyIvar) {
     // @dynamic

Added: cfe/trunk/test/SemaObjC/property-ivar-mismatch.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/property-ivar-mismatch.m?rev=62524&view=auto

==============================================================================
--- cfe/trunk/test/SemaObjC/property-ivar-mismatch.m (added)
+++ cfe/trunk/test/SemaObjC/property-ivar-mismatch.m Mon Jan 19 14:13:47 2009
@@ -0,0 +1,14 @@
+// RUN: clang -fsyntax-only -verify %s
+// Test that arithmatic types on property and its ivar have exact match.
+
+ at interface Test4 
+{
+   char ivar;
+}
+ at property int prop;
+ at end
+
+ at implementation Test4
+ at synthesize prop = ivar;  // expected-error {{type of property 'prop' does not match type of ivar 'ivar'}}
+ at end
+