From: David Majnemer <david.majnemer@gmail.com>
Date: Sat, 15 Feb 2014 01:09:56 +0000 (+0000)
Subject: MS ABI: Fix some layout tests
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=17453db05dbcf69f69b8501040af79b21bfc648d;p=clang

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 C64


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@201453 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/test/Layout/ms-x86-pack-and-align.cpp b/test/Layout/ms-x86-pack-and-align.cpp
index a9685f12e7..27de729074 100644
--- a/test/Layout/ms-x86-pack-and-align.cpp
+++ b/test/Layout/ms-x86-pack-and-align.cpp
@@ -171,17 +171,17 @@ struct CA2 : public CA1, public CA0 {
 // CHECK-NEXT:    9 |   struct CA0 (virtual base) (empty)
 // CHECK-NEXT:      | [sizeof=9, align=1
 // CHECK-NEXT:      |  nvsize=9, nvalign=1]
-// CHECK-C64: *** Dumping AST Record Layout
-// CHECK-C64: *** Dumping AST Record Layout
-// CHECK-C64: *** Dumping AST Record Layout
-// CHECK-C64-NEXT:    0 | struct CA2
-// CHECK-C64-NEXT:    0 |   (CA2 vftable pointer)
-// CHECK-C64-NEXT:    8 |   struct CA1 (base)
-// CHECK-C64-NEXT:    8 |     (CA1 vbtable pointer)
-// CHECK-C64-NEXT:   17 |   struct CA0 (base) (empty)
-// CHECK-C64-NEXT:   17 |   struct CA0 (virtual base) (empty)
-// CHECK-C64-NEXT:      | [sizeof=17, align=1
-// CHECK-C64-NEXT:      |  nvsize=17, nvalign=1]
+// CHECK-X64: *** Dumping AST Record Layout
+// CHECK-X64: *** Dumping AST Record Layout
+// CHECK-X64: *** Dumping AST Record Layout
+// CHECK-X64-NEXT:    0 | struct CA2
+// CHECK-X64-NEXT:    0 |   (CA2 vftable pointer)
+// CHECK-X64-NEXT:    8 |   struct CA1 (base)
+// CHECK-X64-NEXT:    8 |     (CA1 vbtable pointer)
+// CHECK-X64-NEXT:   17 |   struct CA0 (base) (empty)
+// CHECK-X64-NEXT:   17 |   struct CA0 (virtual base) (empty)
+// CHECK-X64-NEXT:      | [sizeof=17, align=1
+// CHECK-X64-NEXT:      |  nvsize=17, nvalign=1]
 
 #pragma pack(16)
 struct YA {
@@ -193,9 +193,6 @@ struct YA {
 // CHECK-NEXT:      | [sizeof=32, align=32
 // CHECK-NEXT:      |  nvsize=32, nvalign=32]
 // 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 YA (empty)
 // CHECK-X64-NEXT:    0 |   char
 // CHECK-X64-NEXT:      | [sizeof=32, align=32