Type of property and its ivar is more restrictive
that rules for assignment.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@62524 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index d140b90..c4fccc7 100644
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -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