diff options
author | Reid Kleckner <reid@kleckner.net> | 2014-02-28 01:03:09 +0000 |
---|---|---|
committer | Reid Kleckner <reid@kleckner.net> | 2014-02-28 01:03:09 +0000 |
commit | 73fb313c19d3772f335be4b66d271c5c64e541df (patch) | |
tree | b199c78b37edcf3ba51df63968e4c53d1fcf6aa0 /test/Layout | |
parent | c2606cec7430e92bbac68e6427f2d83104037515 (diff) |
-fdump-record-layouts: Sort nvbases by offset before printing them
It makes our -fdump-record-layouts a little more sane.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@202457 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Layout')
-rw-r--r-- | test/Layout/ms-x86-primary-bases.cpp | 16 | ||||
-rw-r--r-- | test/Layout/ms-x86-vfvb-alignment.cpp | 12 |
2 files changed, 14 insertions, 14 deletions
diff --git a/test/Layout/ms-x86-primary-bases.cpp b/test/Layout/ms-x86-primary-bases.cpp index bb6b89c6fc..b5bd041fa1 100644 --- a/test/Layout/ms-x86-primary-bases.cpp +++ b/test/Layout/ms-x86-primary-bases.cpp @@ -170,11 +170,11 @@ struct AX : B0X, B1X { int a; AX() : a(0xf000000A) {} virtual void f() { printf( // CHECK: *** Dumping AST Record Layout // CHECK: *** Dumping AST Record Layout // CHECK-NEXT: 0 | struct AX -// CHECK-NEXT: 8 | struct B0X (base) -// CHECK-NEXT: 8 | int a // CHECK-NEXT: 0 | struct B1X (primary base) // CHECK-NEXT: 0 | (B1X vftable pointer) // CHECK-NEXT: 4 | int a +// CHECK-NEXT: 8 | struct B0X (base) +// CHECK-NEXT: 8 | int a // CHECK-NEXT: 12 | int a // CHECK-NEXT: | [sizeof=16, align=4 // CHECK-NEXT: | nvsize=16, nvalign=4] @@ -182,11 +182,11 @@ struct AX : B0X, B1X { int a; AX() : a(0xf000000A) {} virtual void f() { printf( // CHECK-X64: *** Dumping AST Record Layout // CHECK-X64: *** Dumping AST Record Layout // CHECK-X64-NEXT: 0 | struct AX -// CHECK-X64-NEXT: 16 | struct B0X (base) -// CHECK-X64-NEXT: 16 | int a // CHECK-X64-NEXT: 0 | struct B1X (primary base) // CHECK-X64-NEXT: 0 | (B1X vftable pointer) // CHECK-X64-NEXT: 8 | int a +// CHECK-X64-NEXT: 16 | struct B0X (base) +// CHECK-X64-NEXT: 16 | int a // CHECK-X64-NEXT: 20 | int a // CHECK-X64-NEXT: | [sizeof=24, align=8 // CHECK-X64-NEXT: | nvsize=24, nvalign=8] @@ -195,21 +195,21 @@ struct BX : B0X, B1X { int a; BX() : a(0xf000000B) {} virtual void g() { printf( // CHECK: *** Dumping AST Record Layout // CHECK-NEXT: 0 | struct BX -// CHECK-NEXT: 8 | struct B0X (base) -// CHECK-NEXT: 8 | int a // CHECK-NEXT: 0 | struct B1X (primary base) // CHECK-NEXT: 0 | (B1X vftable pointer) // CHECK-NEXT: 4 | int a +// CHECK-NEXT: 8 | struct B0X (base) +// CHECK-NEXT: 8 | int a // CHECK-NEXT: 12 | int a // CHECK-NEXT: | [sizeof=16, align=4 // CHECK-NEXT: | nvsize=16, nvalign=4] // CHECK-X64: *** Dumping AST Record Layout // CHECK-X64-NEXT: 0 | struct BX -// CHECK-X64-NEXT: 16 | struct B0X (base) -// CHECK-X64-NEXT: 16 | int a // CHECK-X64-NEXT: 0 | struct B1X (primary base) // CHECK-X64-NEXT: 0 | (B1X vftable pointer) // CHECK-X64-NEXT: 8 | int a +// CHECK-X64-NEXT: 16 | struct B0X (base) +// CHECK-X64-NEXT: 16 | int a // CHECK-X64-NEXT: 20 | int a // CHECK-X64-NEXT: | [sizeof=24, align=8 // CHECK-X64-NEXT: | nvsize=24, nvalign=8] diff --git a/test/Layout/ms-x86-vfvb-alignment.cpp b/test/Layout/ms-x86-vfvb-alignment.cpp index 7ec0c5f466..f65adc15a6 100644 --- a/test/Layout/ms-x86-vfvb-alignment.cpp +++ b/test/Layout/ms-x86-vfvb-alignment.cpp @@ -200,12 +200,12 @@ struct G : B2, B6, virtual B1 { int a; G() : a(0xf0000010) {} }; // CHECK: *** Dumping AST Record Layout // CHECK: *** Dumping AST Record Layout // CHECK-NEXT: 0 | struct G -// CHECK-NEXT: 8 | struct B2 (base) -// CHECK-NEXT: 8 | (B2 vbtable pointer) -// CHECK-NEXT: 12 | int a // CHECK-NEXT: 0 | struct B6 (primary base) // CHECK-NEXT: 0 | (B6 vftable pointer) // CHECK-NEXT: 4 | int a +// CHECK-NEXT: 8 | struct B2 (base) +// CHECK-NEXT: 8 | (B2 vbtable pointer) +// CHECK-NEXT: 12 | int a // CHECK-NEXT: 16 | int a // CHECK-NEXT: 20 | struct B1 (virtual base) // CHECK-NEXT: 20 | char a @@ -214,12 +214,12 @@ struct G : B2, B6, virtual B1 { int a; G() : a(0xf0000010) {} }; // CHECK-X64: *** Dumping AST Record Layout // CHECK-X64: *** Dumping AST Record Layout // CHECK-X64-NEXT: 0 | struct G -// CHECK-X64-NEXT: 16 | struct B2 (base) -// CHECK-X64-NEXT: 16 | (B2 vbtable pointer) -// CHECK-X64-NEXT: 24 | int a // CHECK-X64-NEXT: 0 | struct B6 (primary base) // CHECK-X64-NEXT: 0 | (B6 vftable pointer) // CHECK-X64-NEXT: 8 | int a +// CHECK-X64-NEXT: 16 | struct B2 (base) +// CHECK-X64-NEXT: 16 | (B2 vbtable pointer) +// CHECK-X64-NEXT: 24 | int a // CHECK-X64-NEXT: 32 | int a // CHECK-X64-NEXT: 40 | struct B1 (virtual base) // CHECK-X64-NEXT: 40 | char a |