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

[Chris Lattner]

Author: lattner
Date: Fri Apr 25 16:17:41 2008
New Revision: 50301

URL: http://llvm.org/viewvc/llvm-project?rev=50301&view=rev
Log:
Remove a bunch of llvm-local code that the fix for non-llvm 
rdar://5724385 made obsolete.  This fixes rdar://5812851, a crash
on objc.dg/objc2-bitfield-abi-1.m and objc.dg/objc2-ivar-offset.m.

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=50301&r1=50300&r2=50301&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/objc/objc-act.c (original)
+++ llvm-gcc-4.2/trunk/gcc/objc/objc-act.c Fri Apr 25 16:17:41 2008
@@ -10532,8 +10532,6 @@
 {
   tree initlist = NULL_TREE;
   int val;
-  /* LLVM LOCAL make sizes add up right */
-  int skipped = 0;
 
   do {
     tree ivar = NULL_TREE;
@@ -10544,7 +10542,6 @@
         /* LLVM LOCAL begin make sizes add up right */
         do {
           field_decl = TREE_CHAIN (field_decl);
-          skipped++;
         }
         /* LLVM LOCAL end */
         while (field_decl && TREE_CODE (field_decl) != FIELD_DECL);
@@ -10599,26 +10596,6 @@
   }
   while (field_decl);
 
-#ifndef OBJCPLUS
-  /* LLVM LOCAL begin make sizes add up right.  The size in 'type' counted
-     any unnamed bitfields that we skipped above; add null nodes at the
-     end of the list to compensate. */
-  while (skipped--)
-    {
-      tree ivar = NULL_TREE;
-      ivar = tree_cons (NULL_TREE, build_int_cst (ptr_type_node, 0), ivar);
-      ivar = tree_cons (NULL_TREE, build_int_cst (string_type_node, 0), ivar);
-      ivar = tree_cons (NULL_TREE, build_int_cst (string_type_node, 0), ivar);
-      ivar = tree_cons (NULL_TREE, build_int_cst (NULL_TREE, 0), ivar);
-      ivar = tree_cons (NULL_TREE, build_int_cst (NULL_TREE, 0), ivar);
-
-      initlist = tree_cons (NULL_TREE, 
-                            objc_build_constructor (type, nreverse(ivar)),
-                            initlist);
-    }
-  /* LLVM LOCAL end */
-#endif
-
   return objc_build_constructor (build_array_type (type, 0),
 				 nreverse (initlist));
 }