[cfe-commits] r122762 - in /cfe/trunk: lib/CodeGen/CGObjCMac.cpp test/CodeGenObjC/ivar-layout-array0-struct.m

[Fariborz Jahanian]

Author: fjahanian
Date: Mon Jan  3 13:23:18 2011
New Revision: 122762

URL: http://llvm.org/viewvc/llvm-project?rev=122762&view=rev
Log:
Consider zero-length array of structs when
computing ivar layouts for objc-gc.
Fixes // rdar://8800513

Added:
    cfe/trunk/test/CodeGenObjC/ivar-layout-array0-struct.m
Modified:
    cfe/trunk/lib/CodeGen/CGObjCMac.cpp

Modified: cfe/trunk/lib/CodeGen/CGObjCMac.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGObjCMac.cpp?rev=122762&r1=122761&r2=122762&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGObjCMac.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGObjCMac.cpp Mon Jan  3 13:23:18 2011
@@ -3681,7 +3681,7 @@
 
       assert(!FQT->isUnionType() &&
              "layout for array of unions not supported");
-      if (FQT->isRecordType()) {
+      if (FQT->isRecordType() && ElCount) {
         int OldIndex = IvarsInfo.size() - 1;
         int OldSkIndex = SkipIvars.size() -1;
 

Added: cfe/trunk/test/CodeGenObjC/ivar-layout-array0-struct.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/ivar-layout-array0-struct.m?rev=122762&view=auto
==============================================================================
--- cfe/trunk/test/CodeGenObjC/ivar-layout-array0-struct.m (added)
+++ cfe/trunk/test/CodeGenObjC/ivar-layout-array0-struct.m Mon Jan  3 13:23:18 2011
@@ -0,0 +1,22 @@
+// RUN: %clang_cc1 -fobjc-gc -triple x86_64-apple-darwin -O0 -S %s -o %t-64.s
+// RUN: FileCheck -check-prefix LP64 --input-file=%t-64.s %s
+
+// rdar://8800513
+ at interface NSObject {
+  id isa;
+}
+ at end
+
+typedef struct {
+    id b;
+} st;
+
+ at interface Test : NSObject {
+    int a;
+    st b[0];
+}
+ at end
+
+ at implementation Test @end
+// CHECK-LP64: L_OBJC_CLASS_NAME_4:
+// CHECK-LP64-NEXT: .asciz      "\001\020"