From 633f59d1262129c2178ab5f868cc8d6797241069 Mon Sep 17 00:00:00 2001
From: Timur Iskhodzhanov <timurrrr@google.com>
Date: Wed, 17 Jul 2013 12:23:51 +0000
Subject: [PATCH] Replace TEST* with CHECK-DAG in vbtable tests

llvm-svn: 186502
---
 clang/test/CodeGenCXX/microsoft-abi-vbtables.cpp | 346 +++++++++++------------
 1 file changed, 161 insertions(+), 185 deletions(-)

diff --git a/clang/test/CodeGenCXX/microsoft-abi-vbtables.cpp b/clang/test/CodeGenCXX/microsoft-abi-vbtables.cpp
index 1a6bdeb..1d95672 100644
--- a/clang/test/CodeGenCXX/microsoft-abi-vbtables.cpp
+++ b/clang/test/CodeGenCXX/microsoft-abi-vbtables.cpp
@@ -1,28 +1,4 @@
-// RUN: %clang_cc1 %s -fno-rtti -cxx-abi microsoft -triple=i386-pc-win32 -emit-llvm -o %t
-//
-// FIXME: These repeated FileCheck invocations are ugly, but I can't get the
-// output in source file order.  Can CHECK-DAG help here?
-// RUN: FileCheck --check-prefix=TEST1  %s < %t
-// RUN: FileCheck --check-prefix=TEST2  %s < %t
-// RUN: FileCheck --check-prefix=TEST3  %s < %t
-// RUN: FileCheck --check-prefix=TEST4  %s < %t
-// RUN: FileCheck --check-prefix=TEST5  %s < %t
-// RUN: FileCheck --check-prefix=TEST6  %s < %t
-// RUN: FileCheck --check-prefix=TEST7  %s < %t
-// RUN: FileCheck --check-prefix=TEST8  %s < %t
-// RUN: FileCheck --check-prefix=TEST9  %s < %t
-// RUN: FileCheck --check-prefix=TEST10 %s < %t
-// RUN: FileCheck --check-prefix=TEST11 %s < %t
-// RUN: FileCheck --check-prefix=TEST12 %s < %t
-// RUN: FileCheck --check-prefix=TEST13 %s < %t
-// RUN: FileCheck --check-prefix=TEST14 %s < %t
-// RUN: FileCheck --check-prefix=TEST15 %s < %t
-// RUN: FileCheck --check-prefix=TEST16 %s < %t
-// RUN: FileCheck --check-prefix=TEST17 %s < %t
-// RUN: FileCheck --check-prefix=TEST18 %s < %t
-// RUN: FileCheck --check-prefix=TEST19 %s < %t
-// RUN: FileCheck --check-prefix=TEST20 %s < %t
-// RUN: FileCheck --check-prefix=TEST21 %s < %t
+// RUN: %clang_cc1 %s -fno-rtti -cxx-abi microsoft -triple=i386-pc-win32 -emit-llvm -o - | FileCheck %s
 
 // See microsoft-abi-structors.cpp for constructor codegen tests.
 
@@ -43,11 +19,11 @@ D d; // Force vbtable emission.
 // C: vbptr C
 //    int c
 
-// TEST1: @"\01??_8D@Test1@@7B01@@" = linkonce_odr unnamed_addr constant [4 x i32] [i32 0, i32 8, i32 12, i32 20]
-// TEST1: @"\01??_8D@Test1@@7BB@1@@" = {{.*}} [2 x i32] [i32 0, i32 -4]
-// TEST1: @"\01??_8D@Test1@@7BC@1@@" = {{.*}} [2 x i32] [i32 0, i32 -12]
-// TEST1: @"\01??_8C@Test1@@7B@" = {{.*}} [2 x i32] [i32 0, i32 8]
-// TEST1: @"\01??_8B@Test1@@7B@" = {{.*}} [2 x i32] [i32 0, i32 8]
+// CHECK-DAG: @"\01??_8D@Test1@@7B01@@" = linkonce_odr unnamed_addr constant [4 x i32] [i32 0, i32 8, i32 12, i32 20]
+// CHECK-DAG: @"\01??_8D@Test1@@7BB@1@@" = {{.*}} [2 x i32] [i32 0, i32 -4]
+// CHECK-DAG: @"\01??_8D@Test1@@7BC@1@@" = {{.*}} [2 x i32] [i32 0, i32 -12]
+// CHECK-DAG: @"\01??_8C@Test1@@7B@" = {{.*}} [2 x i32] [i32 0, i32 8]
+// CHECK-DAG: @"\01??_8B@Test1@@7B@" = {{.*}} [2 x i32] [i32 0, i32 8]
 }
 
 namespace Test2 {
@@ -66,10 +42,10 @@ D d; // Force vbtable emission.
 // D: int d
 // A: int a
 
-// TEST2: @"\01??_8D@Test2@@7BB@1@@" = {{.*}} [2 x i32] [i32 0, i32 20]
-// TEST2: @"\01??_8D@Test2@@7BC@1@@" = {{.*}} [2 x i32] [i32 0, i32 12]
-// TEST2: @"\01??_8C@Test2@@7B@" = {{.*}} [2 x i32] [i32 0, i32 8]
-// TEST2: @"\01??_8B@Test2@@7B@" = {{.*}} [2 x i32] [i32 0, i32 8]
+// CHECK-DAG: @"\01??_8D@Test2@@7BB@1@@" = {{.*}} [2 x i32] [i32 0, i32 20]
+// CHECK-DAG: @"\01??_8D@Test2@@7BC@1@@" = {{.*}} [2 x i32] [i32 0, i32 12]
+// CHECK-DAG: @"\01??_8C@Test2@@7B@" = {{.*}} [2 x i32] [i32 0, i32 8]
+// CHECK-DAG: @"\01??_8B@Test2@@7B@" = {{.*}} [2 x i32] [i32 0, i32 8]
 }
 
 namespace Test3 {
@@ -78,7 +54,7 @@ struct B { int b; };
 struct C : virtual A, virtual B { int c; };
 C c;
 
-// TEST3: @"\01??_8C@Test3@@7B@" = {{.*}} [3 x i32] [i32 0, i32 8, i32 12]
+// CHECK-DAG: @"\01??_8C@Test3@@7B@" = {{.*}} [3 x i32] [i32 0, i32 8, i32 12]
 }
 
 namespace Test4 {
@@ -88,8 +64,8 @@ struct B : virtual A { int b; };
 struct C : B, virtual A { int c; };
 C c; // Force vbtable emission.
 
-// TEST4: @"\01??_8C@Test4@@7B@" = {{.*}} [2 x i32] [i32 0, i32 12]
-// TEST4: @"\01??_8B@Test4@@7B@" = {{.*}} [2 x i32] [i32 0, i32 8]
+// CHECK-DAG: @"\01??_8C@Test4@@7B@" = {{.*}} [2 x i32] [i32 0, i32 12]
+// CHECK-DAG: @"\01??_8B@Test4@@7B@" = {{.*}} [2 x i32] [i32 0, i32 8]
 }
 
 namespace Test5 {
@@ -101,10 +77,10 @@ struct C : B { int c; };
 struct D : B, C { int d; };
 D d; // Force vbtable emission.
 
-// TEST5: @"\01??_8D@Test5@@7BB@1@@"
-// TEST5: @"\01??_8D@Test5@@7BC@1@@"
-// TEST5: @"\01??_8C@Test5@@7B@"
-// TEST5: @"\01??_8B@Test5@@7B@"
+// CHECK-DAG: @"\01??_8D@Test5@@7BB@1@@"
+// CHECK-DAG: @"\01??_8D@Test5@@7BC@1@@"
+// CHECK-DAG: @"\01??_8C@Test5@@7B@"
+// CHECK-DAG: @"\01??_8B@Test5@@7B@"
 }
 
 namespace Test6 {
@@ -118,22 +94,22 @@ struct F : E, B, C { int f; };
 struct G : F, virtual E { int g; };
 G g;
 
-// TEST6: @"\01??_8G@Test6@@7BB@1@E@1@F@1@@" =
-// TEST6: @"\01??_8G@Test6@@7BC@1@E@1@F@1@@" =
-// TEST6: @"\01??_8G@Test6@@7BB@1@F@1@@" =
-// TEST6: @"\01??_8G@Test6@@7BC@1@F@1@@" =
-// TEST6: @"\01??_8G@Test6@@7BB@1@E@1@@" =
-// TEST6: @"\01??_8G@Test6@@7BC@1@E@1@@" =
-// TEST6: @"\01??_8F@Test6@@7BB@1@E@1@@" = {{.*}} [2 x i32] [i32 0, i32 52]
-// TEST6: @"\01??_8F@Test6@@7BC@1@E@1@@" = {{.*}} [2 x i32] [i32 0, i32 44]
-// TEST6: @"\01??_8F@Test6@@7BB@1@@" = {{.*}} [2 x i32] [i32 0, i32 24]
-// TEST6: @"\01??_8F@Test6@@7BC@1@@" = {{.*}} [2 x i32] [i32 0, i32 16]
-// TEST6: @"\01??_8C@Test6@@7B@" = {{.*}} [2 x i32] [i32 0, i32 12]
-// TEST6: @"\01??_8B@Test6@@7B@" = {{.*}} [2 x i32] [i32 0, i32 8]
-// TEST6: @"\01??_8E@Test6@@7BB@1@@" = {{.*}} [2 x i32] [i32 0, i32 28]
-// TEST6: @"\01??_8E@Test6@@7BC@1@@" = {{.*}} [2 x i32] [i32 0, i32 20]
-// TEST6: @"\01??_8D@Test6@@7BB@1@@" = {{.*}} [2 x i32] [i32 0, i32 24]
-// TEST6: @"\01??_8D@Test6@@7BC@1@@" = {{.*}} [2 x i32] [i32 0, i32 16]
+// CHECK-DAG: @"\01??_8G@Test6@@7BB@1@E@1@F@1@@" =
+// CHECK-DAG: @"\01??_8G@Test6@@7BC@1@E@1@F@1@@" =
+// CHECK-DAG: @"\01??_8G@Test6@@7BB@1@F@1@@" =
+// CHECK-DAG: @"\01??_8G@Test6@@7BC@1@F@1@@" =
+// CHECK-DAG: @"\01??_8G@Test6@@7BB@1@E@1@@" =
+// CHECK-DAG: @"\01??_8G@Test6@@7BC@1@E@1@@" =
+// CHECK-DAG: @"\01??_8F@Test6@@7BB@1@E@1@@" = {{.*}} [2 x i32] [i32 0, i32 52]
+// CHECK-DAG: @"\01??_8F@Test6@@7BC@1@E@1@@" = {{.*}} [2 x i32] [i32 0, i32 44]
+// CHECK-DAG: @"\01??_8F@Test6@@7BB@1@@" = {{.*}} [2 x i32] [i32 0, i32 24]
+// CHECK-DAG: @"\01??_8F@Test6@@7BC@1@@" = {{.*}} [2 x i32] [i32 0, i32 16]
+// CHECK-DAG: @"\01??_8C@Test6@@7B@" = {{.*}} [2 x i32] [i32 0, i32 12]
+// CHECK-DAG: @"\01??_8B@Test6@@7B@" = {{.*}} [2 x i32] [i32 0, i32 8]
+// CHECK-DAG: @"\01??_8E@Test6@@7BB@1@@" = {{.*}} [2 x i32] [i32 0, i32 28]
+// CHECK-DAG: @"\01??_8E@Test6@@7BC@1@@" = {{.*}} [2 x i32] [i32 0, i32 20]
+// CHECK-DAG: @"\01??_8D@Test6@@7BB@1@@" = {{.*}} [2 x i32] [i32 0, i32 24]
+// CHECK-DAG: @"\01??_8D@Test6@@7BC@1@@" = {{.*}} [2 x i32] [i32 0, i32 16]
 }
 
 namespace Test7 {
@@ -145,8 +121,8 @@ struct D : virtual A { int d; };
 struct E : B, D, virtual A, virtual C { int e; };
 E o;
 
-// TEST7: @"\01??_8E@Test7@@7B@" = {{.*}} [3 x i32] [i32 0, i32 12, i32 16]
-// TEST7: @"\01??_8D@Test7@@7B@" = {{.*}} [2 x i32] [i32 0, i32 8]
+// CHECK-DAG: @"\01??_8E@Test7@@7B@" = {{.*}} [3 x i32] [i32 0, i32 12, i32 16]
+// CHECK-DAG: @"\01??_8D@Test7@@7B@" = {{.*}} [2 x i32] [i32 0, i32 8]
 }
 
 namespace Test8 {
@@ -157,10 +133,10 @@ struct C : B { int c; };
 struct D : virtual C { int d; };
 D o;
 
-// TEST8: @"\01??_8D@Test8@@7B01@@" = {{.*}} [3 x i32] [i32 0, i32 8, i32 12]
-// TEST8: @"\01??_8D@Test8@@7BC@1@@" = {{.*}} [2 x i32] [i32 0, i32 -4]
-// TEST8: @"\01??_8C@Test8@@7B@" = {{.*}} [2 x i32] [i32 0, i32 12]
-// TEST8: @"\01??_8B@Test8@@7B@" = {{.*}} [2 x i32] [i32 0, i32 8]
+// CHECK-DAG: @"\01??_8D@Test8@@7B01@@" = {{.*}} [3 x i32] [i32 0, i32 8, i32 12]
+// CHECK-DAG: @"\01??_8D@Test8@@7BC@1@@" = {{.*}} [2 x i32] [i32 0, i32 -4]
+// CHECK-DAG: @"\01??_8C@Test8@@7B@" = {{.*}} [2 x i32] [i32 0, i32 12]
+// CHECK-DAG: @"\01??_8B@Test8@@7B@" = {{.*}} [2 x i32] [i32 0, i32 8]
 }
 
 namespace Test9 {
@@ -174,17 +150,17 @@ struct D : BB, C { int d; };
 struct E : virtual D { };
 E e;
 
-// TEST9: @"\01??_8E@Test9@@7B01@@" =
-// TEST9: @"\01??_8E@Test9@@7BD@1@@" =
-// TEST9: @"\01??_8E@Test9@@7BC@1@@" =
-// TEST9: @"\01??_8E@Test9@@7BB@1@@" =
-// TEST9: @"\01??_8D@Test9@@7B@" =
-// TEST9: @"\01??_8D@Test9@@7BC@1@@" =
-// TEST9: @"\01??_8D@Test9@@7BB@1@@" =
-// TEST9: @"\01??_8C@Test9@@7B01@@" =
-// TEST9: @"\01??_8C@Test9@@7BB@1@@" =
-// TEST9: @"\01??_8BB@Test9@@7B@" =
-// TEST9: @"\01??_8B@Test9@@7B@" =
+// CHECK-DAG: @"\01??_8E@Test9@@7B01@@" =
+// CHECK-DAG: @"\01??_8E@Test9@@7BD@1@@" =
+// CHECK-DAG: @"\01??_8E@Test9@@7BC@1@@" =
+// CHECK-DAG: @"\01??_8E@Test9@@7BB@1@@" =
+// CHECK-DAG: @"\01??_8D@Test9@@7B@" =
+// CHECK-DAG: @"\01??_8D@Test9@@7BC@1@@" =
+// CHECK-DAG: @"\01??_8D@Test9@@7BB@1@@" =
+// CHECK-DAG: @"\01??_8C@Test9@@7B01@@" =
+// CHECK-DAG: @"\01??_8C@Test9@@7BB@1@@" =
+// CHECK-DAG: @"\01??_8BB@Test9@@7B@" =
+// CHECK-DAG: @"\01??_8B@Test9@@7B@" =
 }
 
 namespace Test10 {
@@ -194,8 +170,8 @@ struct C : virtual A { int c; };
 struct D : B, C { int d; };
 D d;
 
-// TEST10: @"\01??_8D@Test10@@7B@" =
-// TEST10: @"\01??_8C@Test10@@7B@" =
+// CHECK-DAG: @"\01??_8D@Test10@@7B@" =
+// CHECK-DAG: @"\01??_8C@Test10@@7B@" =
 
 }
 
@@ -209,12 +185,12 @@ struct E : C { int e; };
 struct F : D, E { int f; };
 F f;
 
-// TEST11: @"\01??_8F@Test11@@7BD@1@@" = linkonce_odr unnamed_addr constant [2 x i32] [i32 0, i32 28]
-// TEST11: @"\01??_8F@Test11@@7BE@1@@" = linkonce_odr unnamed_addr constant [2 x i32] [i32 0, i32 16]
-// TEST11: @"\01??_8E@Test11@@7B@" = linkonce_odr unnamed_addr constant [2 x i32] [i32 0, i32 12]
-// TEST11: @"\01??_8C@Test11@@7B@" = linkonce_odr unnamed_addr constant [2 x i32] [i32 0, i32 8]
-// TEST11: @"\01??_8D@Test11@@7B@" = linkonce_odr unnamed_addr constant [2 x i32] [i32 0, i32 12]
-// TEST11: @"\01??_8B@Test11@@7B@" = linkonce_odr unnamed_addr constant [2 x i32] [i32 0, i32 8]
+// CHECK-DAG: @"\01??_8F@Test11@@7BD@1@@" = linkonce_odr unnamed_addr constant [2 x i32] [i32 0, i32 28]
+// CHECK-DAG: @"\01??_8F@Test11@@7BE@1@@" = linkonce_odr unnamed_addr constant [2 x i32] [i32 0, i32 16]
+// CHECK-DAG: @"\01??_8E@Test11@@7B@" = linkonce_odr unnamed_addr constant [2 x i32] [i32 0, i32 12]
+// CHECK-DAG: @"\01??_8C@Test11@@7B@" = linkonce_odr unnamed_addr constant [2 x i32] [i32 0, i32 8]
+// CHECK-DAG: @"\01??_8D@Test11@@7B@" = linkonce_odr unnamed_addr constant [2 x i32] [i32 0, i32 12]
+// CHECK-DAG: @"\01??_8B@Test11@@7B@" = linkonce_odr unnamed_addr constant [2 x i32] [i32 0, i32 8]
 
 }
 
@@ -227,17 +203,17 @@ struct D : C, B { int d; };
 struct E : D, C, B { int e; };
 E e;
 
-// TEST12: @"\01??_8E@Test12@@7BC@1@D@1@@" =
-// TEST12: @"\01??_8E@Test12@@7BB@1@D@1@@" =
-// TEST12: @"\01??_8E@Test12@@7BD@1@@" =
-// TEST12: @"\01??_8E@Test12@@7BC@1@@" =
-// TEST12: @"\01??_8E@Test12@@7BB@1@@" =
-// TEST12: @"\01??_8C@Test12@@7B01@@" =
-// TEST12: @"\01??_8C@Test12@@7BB@1@@" =
-// TEST12: @"\01??_8D@Test12@@7BC@1@@" =
-// TEST12: @"\01??_8D@Test12@@7BB@1@@" =
-// TEST12: @"\01??_8D@Test12@@7B@" =
-// TEST12: @"\01??_8B@Test12@@7B@" =
+// CHECK-DAG: @"\01??_8E@Test12@@7BC@1@D@1@@" =
+// CHECK-DAG: @"\01??_8E@Test12@@7BB@1@D@1@@" =
+// CHECK-DAG: @"\01??_8E@Test12@@7BD@1@@" =
+// CHECK-DAG: @"\01??_8E@Test12@@7BC@1@@" =
+// CHECK-DAG: @"\01??_8E@Test12@@7BB@1@@" =
+// CHECK-DAG: @"\01??_8C@Test12@@7B01@@" =
+// CHECK-DAG: @"\01??_8C@Test12@@7BB@1@@" =
+// CHECK-DAG: @"\01??_8D@Test12@@7BC@1@@" =
+// CHECK-DAG: @"\01??_8D@Test12@@7BB@1@@" =
+// CHECK-DAG: @"\01??_8D@Test12@@7B@" =
+// CHECK-DAG: @"\01??_8B@Test12@@7B@" =
 }
 
 namespace Test13 {
@@ -248,17 +224,17 @@ struct D : virtual C { int d; };
 struct E : D, C, B { int e; };
 E e;
 
-// TEST13: @"\01??_8E@Test13@@7BD@1@@" =
-// TEST13: @"\01??_8E@Test13@@7BC@1@D@1@@" =
-// TEST13: @"\01??_8E@Test13@@7BB@1@D@1@@" =
-// TEST13: @"\01??_8E@Test13@@7BC@1@@" =
-// TEST13: @"\01??_8E@Test13@@7BB@1@@" =
-// TEST13: @"\01??_8D@Test13@@7B@" =
-// TEST13: @"\01??_8D@Test13@@7BC@1@@" =
-// TEST13: @"\01??_8D@Test13@@7BB@1@@" =
-// TEST13: @"\01??_8C@Test13@@7B01@@" =
-// TEST13: @"\01??_8C@Test13@@7BB@1@@" =
-// TEST13: @"\01??_8B@Test13@@7B@" =
+// CHECK-DAG: @"\01??_8E@Test13@@7BD@1@@" =
+// CHECK-DAG: @"\01??_8E@Test13@@7BC@1@D@1@@" =
+// CHECK-DAG: @"\01??_8E@Test13@@7BB@1@D@1@@" =
+// CHECK-DAG: @"\01??_8E@Test13@@7BC@1@@" =
+// CHECK-DAG: @"\01??_8E@Test13@@7BB@1@@" =
+// CHECK-DAG: @"\01??_8D@Test13@@7B@" =
+// CHECK-DAG: @"\01??_8D@Test13@@7BC@1@@" =
+// CHECK-DAG: @"\01??_8D@Test13@@7BB@1@@" =
+// CHECK-DAG: @"\01??_8C@Test13@@7B01@@" =
+// CHECK-DAG: @"\01??_8C@Test13@@7BB@1@@" =
+// CHECK-DAG: @"\01??_8B@Test13@@7B@" =
 }
 
 namespace Test14 {
@@ -269,15 +245,15 @@ struct D : virtual C { int d; };
 struct E : D, virtual C, virtual B { int e; };
 E e;
 
-// TEST14: @"\01??_8E@Test14@@7B@" =
-// TEST14: @"\01??_8E@Test14@@7BC@1@@" =
-// TEST14: @"\01??_8E@Test14@@7BB@1@@" =
-// TEST14: @"\01??_8D@Test14@@7B@" =
-// TEST14: @"\01??_8D@Test14@@7BC@1@@" =
-// TEST14: @"\01??_8D@Test14@@7BB@1@@" =
-// TEST14: @"\01??_8C@Test14@@7B01@@" =
-// TEST14: @"\01??_8C@Test14@@7BB@1@@" =
-// TEST14: @"\01??_8B@Test14@@7B@" =
+// CHECK-DAG: @"\01??_8E@Test14@@7B@" =
+// CHECK-DAG: @"\01??_8E@Test14@@7BC@1@@" =
+// CHECK-DAG: @"\01??_8E@Test14@@7BB@1@@" =
+// CHECK-DAG: @"\01??_8D@Test14@@7B@" =
+// CHECK-DAG: @"\01??_8D@Test14@@7BC@1@@" =
+// CHECK-DAG: @"\01??_8D@Test14@@7BB@1@@" =
+// CHECK-DAG: @"\01??_8C@Test14@@7B01@@" =
+// CHECK-DAG: @"\01??_8C@Test14@@7BB@1@@" =
+// CHECK-DAG: @"\01??_8B@Test14@@7B@" =
 }
 
 namespace Test15 {
@@ -288,14 +264,14 @@ struct D : virtual B { int d; };
 struct E : D, C, B { int e; };
 E e;
 
-// TEST15: @"\01??_8E@Test15@@7BD@1@@" =
-// TEST15: @"\01??_8E@Test15@@7BB@1@D@1@@" =
-// TEST15: @"\01??_8E@Test15@@7BC@1@@" =
-// TEST15: @"\01??_8E@Test15@@7BB@1@@" =
-// TEST15: @"\01??_8C@Test15@@7B@" =
-// TEST15: @"\01??_8D@Test15@@7B01@@" =
-// TEST15: @"\01??_8D@Test15@@7BB@1@@" =
-// TEST15: @"\01??_8B@Test15@@7B@" =
+// CHECK-DAG: @"\01??_8E@Test15@@7BD@1@@" =
+// CHECK-DAG: @"\01??_8E@Test15@@7BB@1@D@1@@" =
+// CHECK-DAG: @"\01??_8E@Test15@@7BC@1@@" =
+// CHECK-DAG: @"\01??_8E@Test15@@7BB@1@@" =
+// CHECK-DAG: @"\01??_8C@Test15@@7B@" =
+// CHECK-DAG: @"\01??_8D@Test15@@7B01@@" =
+// CHECK-DAG: @"\01??_8D@Test15@@7BB@1@@" =
+// CHECK-DAG: @"\01??_8B@Test15@@7B@" =
 }
 
 namespace Test16 {
@@ -307,23 +283,23 @@ struct E : virtual D { int e; }; // ambig
 struct F : E, D, C, B { int f; };  // ambig
 F f;
 
-// TEST16: @"\01??_8F@Test16@@7BE@1@@" =
-// TEST16: @"\01??_8F@Test16@@7BD@1@E@1@@" =
-// TEST16: @"\01??_8F@Test16@@7BC@1@E@1@@" =
-// TEST16: @"\01??_8F@Test16@@7BB@1@E@1@@" =
-// TEST16: @"\01??_8F@Test16@@7BD@1@@" =
-// TEST16: @"\01??_8F@Test16@@7BC@1@@" =
-// TEST16: @"\01??_8F@Test16@@7BB@1@@" =
-// TEST16: @"\01??_8E@Test16@@7B01@@" =
-// TEST16: @"\01??_8E@Test16@@7BD@1@@" =
-// TEST16: @"\01??_8E@Test16@@7BC@1@@" =
-// TEST16: @"\01??_8E@Test16@@7BB@1@@" =
-// TEST16: @"\01??_8D@Test16@@7B@" =
-// TEST16: @"\01??_8D@Test16@@7BC@1@@" =
-// TEST16: @"\01??_8D@Test16@@7BB@1@@" =
-// TEST16: @"\01??_8C@Test16@@7B01@@" =
-// TEST16: @"\01??_8C@Test16@@7BB@1@@" =
-// TEST16: @"\01??_8B@Test16@@7B@" =
+// CHECK-DAG: @"\01??_8F@Test16@@7BE@1@@" =
+// CHECK-DAG: @"\01??_8F@Test16@@7BD@1@E@1@@" =
+// CHECK-DAG: @"\01??_8F@Test16@@7BC@1@E@1@@" =
+// CHECK-DAG: @"\01??_8F@Test16@@7BB@1@E@1@@" =
+// CHECK-DAG: @"\01??_8F@Test16@@7BD@1@@" =
+// CHECK-DAG: @"\01??_8F@Test16@@7BC@1@@" =
+// CHECK-DAG: @"\01??_8F@Test16@@7BB@1@@" =
+// CHECK-DAG: @"\01??_8E@Test16@@7B01@@" =
+// CHECK-DAG: @"\01??_8E@Test16@@7BD@1@@" =
+// CHECK-DAG: @"\01??_8E@Test16@@7BC@1@@" =
+// CHECK-DAG: @"\01??_8E@Test16@@7BB@1@@" =
+// CHECK-DAG: @"\01??_8D@Test16@@7B@" =
+// CHECK-DAG: @"\01??_8D@Test16@@7BC@1@@" =
+// CHECK-DAG: @"\01??_8D@Test16@@7BB@1@@" =
+// CHECK-DAG: @"\01??_8C@Test16@@7B01@@" =
+// CHECK-DAG: @"\01??_8C@Test16@@7BB@1@@" =
+// CHECK-DAG: @"\01??_8B@Test16@@7B@" =
 }
 
 namespace Test17 {
@@ -342,16 +318,16 @@ struct J : virtual I { int j; };
 struct K : virtual J { int k; }; // ambig
 K k;
 
-// TEST17: @"\01??_8K@Test17@@7B01@@" =
-// TEST17: @"\01??_8J@Test17@@7B@" =
-// TEST17: @"\01??_8I@Test17@@7B01@@" =
-// TEST17: @"\01??_8H@Test17@@7B@" =
-// TEST17: @"\01??_8G@Test17@@7B01@@" =
-// TEST17: @"\01??_8F@Test17@@7B@" =
-// TEST17: @"\01??_8E@Test17@@7B01@@" =
-// TEST17: @"\01??_8D@Test17@@7B@" =
-// TEST17: @"\01??_8C@Test17@@7B01@@" =
-// TEST17: @"\01??_8B@Test17@@7B@" =
+// CHECK-DAG: @"\01??_8K@Test17@@7B01@@" =
+// CHECK-DAG: @"\01??_8J@Test17@@7B@" =
+// CHECK-DAG: @"\01??_8I@Test17@@7B01@@" =
+// CHECK-DAG: @"\01??_8H@Test17@@7B@" =
+// CHECK-DAG: @"\01??_8G@Test17@@7B01@@" =
+// CHECK-DAG: @"\01??_8F@Test17@@7B@" =
+// CHECK-DAG: @"\01??_8E@Test17@@7B01@@" =
+// CHECK-DAG: @"\01??_8D@Test17@@7B@" =
+// CHECK-DAG: @"\01??_8C@Test17@@7B01@@" =
+// CHECK-DAG: @"\01??_8B@Test17@@7B@" =
 }
 
 namespace Test18 {
@@ -362,14 +338,14 @@ struct D : C, B { int d; };
 struct E : D, C, B { int e; };
 E e;
 
-// TEST18: @"\01??_8E@Test18@@7BC@1@D@1@@" =
-// TEST18: @"\01??_8E@Test18@@7BB@1@D@1@@" =
-// TEST18: @"\01??_8E@Test18@@7BC@1@@" =
-// TEST18: @"\01??_8E@Test18@@7BB@1@@" =
-// TEST18: @"\01??_8B@Test18@@7B@" =
-// TEST18: @"\01??_8C@Test18@@7B@" =
-// TEST18: @"\01??_8D@Test18@@7BC@1@@" =
-// TEST18: @"\01??_8D@Test18@@7BB@1@@" =
+// CHECK-DAG: @"\01??_8E@Test18@@7BC@1@D@1@@" =
+// CHECK-DAG: @"\01??_8E@Test18@@7BB@1@D@1@@" =
+// CHECK-DAG: @"\01??_8E@Test18@@7BC@1@@" =
+// CHECK-DAG: @"\01??_8E@Test18@@7BB@1@@" =
+// CHECK-DAG: @"\01??_8B@Test18@@7B@" =
+// CHECK-DAG: @"\01??_8C@Test18@@7B@" =
+// CHECK-DAG: @"\01??_8D@Test18@@7BC@1@@" =
+// CHECK-DAG: @"\01??_8D@Test18@@7BB@1@@" =
 }
 
 namespace Test19 {
@@ -380,16 +356,16 @@ struct D : virtual C, virtual B { int d; };
 struct E : virtual D, virtual C, virtual B { int e; };
 E e;
 
-// TEST19: @"\01??_8E@Test19@@7B01@@" =
-// TEST19: @"\01??_8E@Test19@@7BD@1@@" =
-// TEST19: @"\01??_8E@Test19@@7BC@1@@" =
-// TEST19: @"\01??_8E@Test19@@7BB@1@@" =
-// TEST19: @"\01??_8D@Test19@@7B@" =
-// TEST19: @"\01??_8D@Test19@@7BC@1@@" =
-// TEST19: @"\01??_8D@Test19@@7BB@1@@" =
-// TEST19: @"\01??_8C@Test19@@7B01@@" =
-// TEST19: @"\01??_8C@Test19@@7BB@1@@" =
-// TEST19: @"\01??_8B@Test19@@7B@" =
+// CHECK-DAG: @"\01??_8E@Test19@@7B01@@" =
+// CHECK-DAG: @"\01??_8E@Test19@@7BD@1@@" =
+// CHECK-DAG: @"\01??_8E@Test19@@7BC@1@@" =
+// CHECK-DAG: @"\01??_8E@Test19@@7BB@1@@" =
+// CHECK-DAG: @"\01??_8D@Test19@@7B@" =
+// CHECK-DAG: @"\01??_8D@Test19@@7BC@1@@" =
+// CHECK-DAG: @"\01??_8D@Test19@@7BB@1@@" =
+// CHECK-DAG: @"\01??_8C@Test19@@7B01@@" =
+// CHECK-DAG: @"\01??_8C@Test19@@7BB@1@@" =
+// CHECK-DAG: @"\01??_8B@Test19@@7B@" =
 }
 
 namespace Test20 {
@@ -401,10 +377,10 @@ struct D : virtual B { int d; };
 struct E : C, D { int e; };
 E f;
 
-// TEST20: @"\01??_8E@Test20@@7BC@1@@" = linkonce_odr unnamed_addr constant [3 x i32] [i32 0, i32 20, i32 24]
-// TEST20: @"\01??_8E@Test20@@7BD@1@@" = linkonce_odr unnamed_addr constant [2 x i32] [i32 0, i32 16]
-// TEST20: @"\01??_8D@Test20@@7B@" = linkonce_odr unnamed_addr constant [2 x i32] [i32 0, i32 8]
-// TEST20: @"\01??_8C@Test20@@7B@" = linkonce_odr unnamed_addr constant [2 x i32] [i32 0, i32 8]
+// CHECK-DAG: @"\01??_8E@Test20@@7BC@1@@" = linkonce_odr unnamed_addr constant [3 x i32] [i32 0, i32 20, i32 24]
+// CHECK-DAG: @"\01??_8E@Test20@@7BD@1@@" = linkonce_odr unnamed_addr constant [2 x i32] [i32 0, i32 16]
+// CHECK-DAG: @"\01??_8D@Test20@@7B@" = linkonce_odr unnamed_addr constant [2 x i32] [i32 0, i32 8]
+// CHECK-DAG: @"\01??_8C@Test20@@7B@" = linkonce_odr unnamed_addr constant [2 x i32] [i32 0, i32 8]
 }
 
 namespace Test21 {
@@ -418,19 +394,19 @@ struct G : E { int g; };
 struct H : F, G { int h; };
 H h;
 
-// TEST21: @"\01??_8H@Test21@@7B@" =
-// TEST21: @"\01??_8H@Test21@@7BC@1@F@1@@" =
-// TEST21: @"\01??_8H@Test21@@7BD@1@F@1@@" =
-// TEST21: @"\01??_8H@Test21@@7BC@1@G@1@@" =
-// TEST21: @"\01??_8H@Test21@@7BD@1@G@1@@" =
-// TEST21: @"\01??_8G@Test21@@7BC@1@@" =
-// TEST21: @"\01??_8G@Test21@@7BD@1@@" =
-// TEST21: @"\01??_8F@Test21@@7B@" =
-// TEST21: @"\01??_8F@Test21@@7BC@1@@" =
-// TEST21: @"\01??_8F@Test21@@7BD@1@@" =
-// TEST21: @"\01??_8E@Test21@@7BC@1@@" =
-// TEST21: @"\01??_8E@Test21@@7BD@1@@" =
-// TEST21: @"\01??_8D@Test21@@7B@" =
-// TEST21: @"\01??_8B@Test21@@7B@" =
-// TEST21: @"\01??_8C@Test21@@7B@" =
+// CHECK-DAG: @"\01??_8H@Test21@@7B@" =
+// CHECK-DAG: @"\01??_8H@Test21@@7BC@1@F@1@@" =
+// CHECK-DAG: @"\01??_8H@Test21@@7BD@1@F@1@@" =
+// CHECK-DAG: @"\01??_8H@Test21@@7BC@1@G@1@@" =
+// CHECK-DAG: @"\01??_8H@Test21@@7BD@1@G@1@@" =
+// CHECK-DAG: @"\01??_8G@Test21@@7BC@1@@" =
+// CHECK-DAG: @"\01??_8G@Test21@@7BD@1@@" =
+// CHECK-DAG: @"\01??_8F@Test21@@7B@" =
+// CHECK-DAG: @"\01??_8F@Test21@@7BC@1@@" =
+// CHECK-DAG: @"\01??_8F@Test21@@7BD@1@@" =
+// CHECK-DAG: @"\01??_8E@Test21@@7BC@1@@" =
+// CHECK-DAG: @"\01??_8E@Test21@@7BD@1@@" =
+// CHECK-DAG: @"\01??_8D@Test21@@7B@" =
+// CHECK-DAG: @"\01??_8B@Test21@@7B@" =
+// CHECK-DAG: @"\01??_8C@Test21@@7B@" =
 }
-- 
2.7.4