[llvm-commits] [llvm-gcc-4.2] r116131 - /llvm-gcc-4.2/trunk/gcc/objc/objc-act.c

[Bill Wendling]

Author: void
Date: Fri Oct  8 19:36:11 2010
New Revision: 116131

URL: http://llvm.org/viewvc/llvm-project?rev=116131&view=rev
Log:
This code was merged into llvm-gcc wrong. Fariborz said it should be here
instead. See <rdar://problem/8529889>

Modified:
    llvm-gcc-4.2/trunk/gcc/objc/objc-act.c

Modified: llvm-gcc-4.2/trunk/gcc/objc/objc-act.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/objc/objc-act.c?rev=116131&r1=116130&r2=116131&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/objc/objc-act.c (original)
+++ llvm-gcc-4.2/trunk/gcc/objc/objc-act.c Fri Oct  8 19:36:11 2010
@@ -1935,14 +1935,6 @@
                 && CLASS_SUPER_NAME (implementation_template))
 	    class = lookup_interface (CLASS_SUPER_NAME (implementation_template));
 	}
-      /* APPLE LOCAL begin radar 8351204 */
-      if (!class) {
-        error ("expression is not assignable - type of receiver is unknown");
-        /* recover */
-        return objc_build_property_setter_name (property_ident, true);
-      }
-      /* APPLE LOCAL end radar 8351204 */
-
       /* APPLE LOCAL begin radar 8290584 */
       else {
         /* receiver could be of type id<protocol,...> find property in 
@@ -1960,6 +1952,13 @@
         }
       }
       /* APPLE LOCAL end radar 8290584 */
+      /* APPLE LOCAL begin radar 8351204 */
+      if (!class) {
+        error ("expression is not assignable - type of receiver is unknown");
+        /* recover */
+        return objc_build_property_setter_name (property_ident, true);
+      }
+      /* APPLE LOCAL end radar 8351204 */
     }
   else
     {