diff options
| -rw-r--r-- | lib/CodeGen/CGRecordLayoutBuilder.cpp | 8 | ||||
| -rw-r--r-- | test/CodeGenCXX/class-layout.cpp | 14 |
2 files changed, 21 insertions, 1 deletions
diff --git a/lib/CodeGen/CGRecordLayoutBuilder.cpp b/lib/CodeGen/CGRecordLayoutBuilder.cpp index 1193e974e1..7f69d6dc8a 100644 --- a/lib/CodeGen/CGRecordLayoutBuilder.cpp +++ b/lib/CodeGen/CGRecordLayoutBuilder.cpp @@ -721,7 +721,13 @@ CGRecordLayoutBuilder::LayoutNonVirtualBases(const CXXRecordDecl *RD, llvm::FunctionType::get(llvm::Type::getInt32Ty(Types.getLLVMContext()), /*isVarArg=*/true); llvm::Type *VTableTy = FunctionType->getPointerTo(); - + + if (getTypeAlignment(VTableTy) > Alignment) { + // FIXME: Should we allow this to happen in Sema? + assert(!Packed && "Alignment is wrong even with packed struct!"); + return false; + } + assert(NextFieldOffset.isZero() && "VTable pointer must come first!"); AppendField(CharUnits::Zero(), VTableTy->getPointerTo()); diff --git a/test/CodeGenCXX/class-layout.cpp b/test/CodeGenCXX/class-layout.cpp index dac0a0ae54..21e1a2b40f 100644 --- a/test/CodeGenCXX/class-layout.cpp +++ b/test/CodeGenCXX/class-layout.cpp @@ -77,3 +77,17 @@ namespace Test6 { class E : public B {}; E *e; } + +// <rdar://problem/11324125>: Make sure this doesn't crash. (It's okay +// if we start rejecting it at some point.) +namespace Test7 { + #pragma pack (1) + class A {}; + // CHECK: %"class.Test7::B" = type <{ i32 (...)**, %"class.Test7::A" }> + class B { + virtual ~B(); + A a; + }; + B* b; + #pragma pack () +} |