From ec7248c93fa7188e326de3e2e6d883e9d2dc890d Mon Sep 17 00:00:00 2001 From: David Majnemer Date: Sat, 15 Feb 2014 01:21:20 +0000 Subject: [PATCH] MS ABI: Fix some layout tests Some lines intended to be used for testing x86_64 ABI compatibility were not firing because lines were annotated with the wrong FileCheck prefix: X64 vs 64 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@201454 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Layout/ms-x86-empty-virtual-base.cpp | 36 ++++++++++------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/test/Layout/ms-x86-empty-virtual-base.cpp b/test/Layout/ms-x86-empty-virtual-base.cpp index 28db524e9d..819246ee2a 100644 --- a/test/Layout/ms-x86-empty-virtual-base.cpp +++ b/test/Layout/ms-x86-empty-virtual-base.cpp @@ -132,22 +132,22 @@ struct D { // CHECK: 32 | int a // CHECK-NEXT: | [sizeof=40, align=8 // CHECK-NEXT: | nvsize=40, nvalign=8] -// CHECK-64: *** Dumping AST Record Layout -// CHECK-64: *** Dumping AST Record Layout -// CHECK-64: *** Dumping AST Record Layout -// CHECK-64: *** Dumping AST Record Layout -// CHECK-64-NEXT: 0 | struct D -// CHECK-64-NEXT: 0 | struct B0 b0 (empty) -// CHECK-64: 8 | struct C0 c0 -// CHECK-64-NEXT: 8 | int a -// CHECK-64: 12 | struct C1 c1 -// CHECK-64-NEXT: 12 | int a -// CHECK-64: 16 | struct C2 c2 -// CHECK-64-NEXT: 16 | int a -// CHECK-64: 24 | struct B1 b1 (empty) -// CHECK-64: 32 | int a -// CHECK-64-NEXT: | [sizeof=40, align=8 -// CHECK-64-NEXT: | nvsize=40, nvalign=8] +// CHECK-X64: *** Dumping AST Record Layout +// CHECK-X64: *** Dumping AST Record Layout +// CHECK-X64: *** Dumping AST Record Layout +// CHECK-X64: *** Dumping AST Record Layout +// CHECK-X64-NEXT: 0 | struct D +// CHECK-X64-NEXT: 0 | struct B0 b0 (empty) +// CHECK-X64: 8 | struct C0 c0 +// CHECK-X64-NEXT: 8 | int a +// CHECK-X64: 12 | struct C1 c1 +// CHECK-X64-NEXT: 12 | int a +// CHECK-X64: 16 | struct C2 c2 +// CHECK-X64-NEXT: 16 | int a +// CHECK-X64: 24 | struct B1 b1 (empty) +// CHECK-X64: 32 | int a +// CHECK-X64-NEXT: | [sizeof=40, align=8 +// CHECK-X64-NEXT: | nvsize=40, nvalign=8] struct E : virtual B0, virtual C0, virtual C1, virtual C2, virtual B1 { int a; @@ -169,10 +169,6 @@ struct E : virtual B0, virtual C0, virtual C1, virtual C2, virtual B1 { // CHECK-NEXT: | [sizeof=24, align=8 // CHECK-NEXT: | nvsize=8, nvalign=8] // CHECK-X64: *** Dumping AST Record Layout -// CHECK-X64: *** Dumping AST Record Layout -// CHECK-X64: *** Dumping AST Record Layout -// CHECK-X64: *** Dumping AST Record Layout -// CHECK-X64: *** Dumping AST Record Layout // CHECK-X64-NEXT: 0 | struct E // CHECK-X64-NEXT: 0 | (E vbtable pointer) // CHECK-X64-NEXT: 8 | int a -- 2.40.0