[llvm-commits] [llvm-gcc-4.0] r43010 - /llvm-gcc-4.0/trunk/gcc/objc/objc-act.c

[Bill Wendling]

Author: void
Date: Mon Oct 15 15:47:57 2007
New Revision: 43010

URL: http://llvm.org/viewvc/llvm-project?rev=43010&view=rev
Log:
In new ABI, it wants an 'objc_object' pointer instead of 'objc_protocol_extension' pointer

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

Modified: llvm-gcc-4.0/trunk/gcc/objc/objc-act.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/gcc/objc/objc-act.c?rev=43010&r1=43009&r2=43010&view=diff

==============================================================================
--- llvm-gcc-4.0/trunk/gcc/objc/objc-act.c (original)
+++ llvm-gcc-4.0/trunk/gcc/objc/objc-act.c Mon Oct 15 15:47:57 2007
@@ -9330,15 +9330,8 @@
   /* APPLE LOCAL begin radar 4533974 - ObjC newprotocol - radar 4695109 */
   /* APPLE LOCAL LLVM - begin NUL pointer */
   if (newabi)
-    {
-      if (!objc_protocol_extension_template)
-        build_objc_protocol_extension_template ();    
-
-      /* 'isa' is NULL in the new ObjC abi */
-      expr =
-        convert (build_pointer_type (objc_protocol_extension_template),
-                 build_int_cst (NULL_TREE, 0));
-    }
+    /* 'isa' is NULL in the new ObjC abi */
+    expr = convert (objc_object_type, build_int_cst (NULL_TREE, 0));
   /* APPLE LOCAL end radar 4533974 - ObjC newprotocol - radar 4695109 */
   /* APPLE LOCAL begin radar 4585769 - Objective-C 1.0 extensions */
   /* "isa" field now points to struct _objc_protocol_extension * */