[llvm-commits] [llvm-gcc-4.2] r53698 - /llvm-gcc-4.2/branches/Apple/Gaz/gcc/objc/objc-act.c

[Bill Wendling]

Author: void
Date: Wed Jul 16 14:52:08 2008
New Revision: 53698

URL: http://llvm.org/viewvc/llvm-project?rev=53698&view=rev
Log:
Pull r53570 into Gaz:

Fix how the alignment for bitfields is calculated. For instance, in this situation:

typedef unsigned long NSUInteger;
@interface NSData
{
  int x;
}
- (NSUInteger)length;
@end

@interface NSConcreteData : NSData
{
  unsigned int _inline:1;
}
@end


We were generating:

L_OBJC_$_INSTANCE_VARIABLES_NSConcreteData:
        .long   32                      ## 0x20
        .long   1                       ## 0x1
        .quad   _OBJC_IVAR_$_NSConcreteData._inline
        .quad   L_OBJC_METH_VAR_NAME_0
        .quad   L_OBJC_METH_VAR_TYPE_0
        .space  4
        .long   1                       ## 0x1

the ".space 4" should be ".long 2"


Modified:
    llvm-gcc-4.2/branches/Apple/Gaz/gcc/objc/objc-act.c

Modified: llvm-gcc-4.2/branches/Apple/Gaz/gcc/objc/objc-act.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Gaz/gcc/objc/objc-act.c?rev=53698&r1=53697&r2=53698&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Gaz/gcc/objc/objc-act.c (original)
+++ llvm-gcc-4.2/branches/Apple/Gaz/gcc/objc/objc-act.c Wed Jul 16 14:52:08 2008
@@ -10617,7 +10617,10 @@
 
     /* Set alignment */
     /* APPLE LOCAL radar 5724385 */
-    val = TYPE_ALIGN_UNIT (TREE_TYPE (field_decl));
+    val = TYPE_ALIGN_UNIT (
+            DECL_BIT_FIELD_TYPE (field_decl) ? DECL_BIT_FIELD_TYPE (field_decl) : 
+            TREE_TYPE (field_decl));
+    /* APPLE LOCAL end radar 5724385 */
     val = exact_log2 (val);
     ivar = tree_cons (NULL_TREE, build_int_cst (NULL_TREE, val), ivar);