r201453 - MS ABI: Fix some layout tests

David Majnemer david.majnemer at gmail.com
Fri Feb 14 17:09:57 PST 2014


Author: majnemer
Date: Fri Feb 14 19:09:56 2014
New Revision: 201453

URL: http://llvm.org/viewvc/llvm-project?rev=201453&view=rev
Log:
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

Modified:
    cfe/trunk/test/Layout/ms-x86-pack-and-align.cpp

Modified: cfe/trunk/test/Layout/ms-x86-pack-and-align.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Layout/ms-x86-pack-and-align.cpp?rev=201453&r1=201452&r2=201453&view=diff
==============================================================================
--- cfe/trunk/test/Layout/ms-x86-pack-and-align.cpp (original)
+++ cfe/trunk/test/Layout/ms-x86-pack-and-align.cpp Fri Feb 14 19:09:56 2014
@@ -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





More information about the cfe-commits mailing list