[cfe-commits] r155937 - in /cfe/trunk: lib/CodeGen/CGBlocks.cpp test/CodeGen/blocks.c

[John McCall]

Author: rjmccall
Date: Tue May  1 15:28:00 2012
New Revision: 155937

URL: http://llvm.org/viewvc/llvm-project?rev=155937&view=rev
Log:
During block layout, after padding up to the max field alignment,
the alignment might actually exceed the max field alignment;  don't
assert in this case.

Modified:
    cfe/trunk/lib/CodeGen/CGBlocks.cpp
    cfe/trunk/test/CodeGen/blocks.c

Modified: cfe/trunk/lib/CodeGen/CGBlocks.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGBlocks.cpp?rev=155937&r1=155936&r2=155937&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGBlocks.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGBlocks.cpp Tue May  1 15:28:00 2012
@@ -469,9 +469,10 @@
     elementTypes.push_back(llvm::ArrayType::get(CGM.Int8Ty,
                                                 padding.getQuantity()));
     blockSize = newBlockSize;
-    endAlign = maxFieldAlign;
+    endAlign = getLowBit(blockSize); // might be > maxFieldAlign
   }
 
+  assert(endAlign >= maxFieldAlign);
   assert(endAlign == getLowBit(blockSize));
 
   // Slam everything else on now.  This works because they have

Modified: cfe/trunk/test/CodeGen/blocks.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/blocks.c?rev=155937&r1=155936&r2=155937&view=diff
==============================================================================
--- cfe/trunk/test/CodeGen/blocks.c (original)
+++ cfe/trunk/test/CodeGen/blocks.c Tue May  1 15:28:00 2012
@@ -42,9 +42,27 @@
 }
 
 // rdar://problem/11322251
+// The bool can fill in between the header and the long long.
+// Add the appropriate amount of padding between them.
 void f4_helper(long long (^)(void));
+// CHECK: define void @f4()
 void f4(void) {
   _Bool b = 0;
   long long ll = 0;
+  // CHECK: alloca <{ i8*, i32, i32, i8*, {{%.*}}*, i8, [3 x i8], i64 }>, align 8
   f4_helper(^{ if (b) return ll; return 0LL; });
 }
+
+// rdar://problem/11354538
+// The alignment after rounding up to the align of F5 is actually
+// greater than the required alignment.  Don't assert.
+struct F5 {
+  char buffer[32] __attribute((aligned));
+};
+void f5_helper(void (^)(struct F5 *));
+// CHECK: define void @f5()
+void f5(void) {
+  struct F5 value;
+  // CHECK: alloca <{ i8*, i32, i32, i8*, {{%.*}}*, [12 x i8], [[F5:%.*]] }>, align 16
+  f5_helper(^(struct F5 *slot) { *slot = value; });
+}