Complete Rewrite of CGRecordLayoutBuilder
CGRecordLayoutBuilder was aging, complex, multi-pass, and shows signs of
existing before ASTRecordLayoutBuilder. It redundantly performed many
layout operations that are now performed by ASTRecordLayoutBuilder and
asserted that the results were the same. With the addition of support
for the MS-ABI, such as placement of vbptrs, vtordisps, different
bitfield layout and a variety of other features, CGRecordLayoutBuilder
was growing unwieldy in its redundancy.
This patch re-architects CGRecordLayoutBuilder to not perform any
redundant layout but rather, as directly as possible, lower an
ASTRecordLayout to an llvm::type. The new architecture is significantly
smaller and simpler than the CGRecordLayoutBuilder and contains fewer
ABI-specific code paths. It's also one pass.
The architecture of the new system is described in the comments. For the
most part, the new system simply takes all of the fields and bases from
an ASTRecordLayout, sorts them, inserts padding and dumps a record.
Bitfields, unions and primary virtual bases make this process a bit more
complicated. See the inline comments.
In addition, this patch updates a few lit tests due to the fact that the
new system computes more accurate llvm types than CGRecordLayoutBuilder.
Each change is commented individually in the review.
Differential Revision: http://llvm-reviews.chandlerc.com/D2795
llvm-svn: 201907
2014-02-22 07:49:50 +08:00
|
|
|
// RUN: %clang_cc1 %s -emit-llvm -triple=i686-apple-darwin9 -o - | FileCheck %s
|
|
|
|
|
// CHECK: STest1 = type { i32, [4 x i16], double }
|
|
|
|
|
// CHECK: STest2 = type { i16, i16, i32, i32 }
|
|
|
|
|
// CHECK: STest3 = type { i8, i16, i32 }
|
|
|
|
|
// CHECK: STestB1 = type { i8, i8 }
|
|
|
|
|
// CHECK: STestB2 = type { i8, i8, i8 }
|
|
|
|
|
// CHECK: STestB3 = type { i8, i8 }
|
|
|
|
|
// CHECK: STestB4 = type { i8, i8, i8, i8 }
|
|
|
|
|
// CHECK: STestB5 = type { i8, i16, i8 }
|
|
|
|
|
// CHECK: STestB6 = type { i8, i8, i16 }
|
2007-11-01 05:02:10 +08:00
|
|
|
// Test struct layout for x86-darwin target
|
|
|
|
|
|
|
|
|
|
struct STest1 {int x; short y[4]; double z; } st1;
|
2007-11-01 08:07:12 +08:00
|
|
|
struct STest2 {short a,b; int c,d; } st2;
|
|
|
|
|
struct STest3 {char a; short b; int c; } st3;
|
|
|
|
|
|
2007-12-07 03:16:05 +08:00
|
|
|
// Bitfields
|
|
|
|
|
struct STestB1 {char a; char b:2; } stb1;
|
2007-12-11 08:49:18 +08:00
|
|
|
struct STestB2 {char a; char b:5; char c:4; } stb2;
|
|
|
|
|
struct STestB3 {char a; char b:2; } stb3;
|
|
|
|
|
struct STestB4 {char a; short b:2; char c; } stb4;
|
2008-01-22 06:54:57 +08:00
|
|
|
struct STestB5 {char a; short b:10; char c; } stb5;
|
|
|
|
|
struct STestB6 {int a:1; char b; int c:13 } stb6;
|
2007-12-07 03:16:05 +08:00
|
|
|
|
2007-11-01 08:07:12 +08:00
|
|
|
// Packed struct STestP1 {char a; short b; int c; } __attribute__((__packed__)) stp1;
|