[test][msan] Use -DAG to match Debug Info

diff --git a/clang/test/CodeGenCXX/sanitize-dtor-bit-field.cpp b/clang/test/CodeGenCXX/sanitize-dtor-bit-field.cpp
index 71be409..6629cd8 100644 (file)
--- a/clang/test/CodeGenCXX/sanitize-dtor-bit-field.cpp
+++ b/clang/test/CodeGenCXX/sanitize-dtor-bit-field.cpp
@@ -83,7 +83,7 @@ Adjacent ad;
 
 // CHECK-LABEL: !DIFile{{.*}}cpp
 
-// CHECK: ![[DI1]] = {{.*}}line: [[@LINE-68]]
-// CHECK: ![[DI2]] = {{.*}}line: [[@LINE-53]]
-// CHECK: ![[DI3]] = {{.*}}line: [[@LINE-41]]
-// CHECK: ![[DI4]] = {{.*}}line: [[@LINE-28]]
+// CHECK-DAG: ![[DI1]] = {{.*}}line: [[@LINE-68]]
+// CHECK-DAG: ![[DI2]] = {{.*}}line: [[@LINE-53]]
+// CHECK-DAG: ![[DI3]] = {{.*}}line: [[@LINE-41]]
+// CHECK-DAG: ![[DI4]] = {{.*}}line: [[@LINE-28]]

diff --git a/clang/test/CodeGenCXX/sanitize-dtor-callback.cpp b/clang/test/CodeGenCXX/sanitize-dtor-callback.cpp
index 7396e0d..d42008a 100644 (file)
--- a/clang/test/CodeGenCXX/sanitize-dtor-callback.cpp
+++ b/clang/test/CodeGenCXX/sanitize-dtor-callback.cpp
@@ -70,6 +70,6 @@ Defaulted_Non_Trivial def_non_trivial;
 
 // CHECK-LABEL: !DIFile{{.*}}cpp
 
-// CHECK: ![[DI1]] = {{.*}}line: [[@LINE-64]]
-// CHECK: ![[DI2]] = {{.*}}line: [[@LINE-55]]
-// CHECK: ![[DI3]] = {{.*}}line: [[@LINE-33]]
+// CHECK-DAG: ![[DI1]] = {{.*}}line: [[@LINE-64]]
+// CHECK-DAG: ![[DI2]] = {{.*}}line: [[@LINE-55]]
+// CHECK-DAG: ![[DI3]] = {{.*}}line: [[@LINE-33]]

diff --git a/clang/test/CodeGenCXX/sanitize-dtor-derived-class.cpp b/clang/test/CodeGenCXX/sanitize-dtor-derived-class.cpp
index 5c2bec6..1a6aa9e 100644 (file)
--- a/clang/test/CodeGenCXX/sanitize-dtor-derived-class.cpp
+++ b/clang/test/CodeGenCXX/sanitize-dtor-derived-class.cpp
@@ -62,5 +62,5 @@ Derived d;
 
 // CHECK-LABEL: !DIFile{{.*}}cpp
 
-// CHECK: ![[DI1]] = {{.*}}line: [[@LINE-49]]
-// CHECK: ![[DI3]] = {{.*}}line: [[@LINE-39]]
+// CHECK-DAG: ![[DI1]] = {{.*}}line: [[@LINE-49]]
+// CHECK-DAG: ![[DI3]] = {{.*}}line: [[@LINE-39]]

diff --git a/clang/test/CodeGenCXX/sanitize-dtor-nontrivial-virtual-base.cpp b/clang/test/CodeGenCXX/sanitize-dtor-nontrivial-virtual-base.cpp
index 75cee72..d30bd3a 100644 (file)
--- a/clang/test/CodeGenCXX/sanitize-dtor-nontrivial-virtual-base.cpp
+++ b/clang/test/CodeGenCXX/sanitize-dtor-nontrivial-virtual-base.cpp
@@ -86,8 +86,8 @@ Derived d;
 
 // CHECK-LABEL: !DIFile{{.*}}.cpp
 
-// CHECK: ![[DI0]] = {{.*}}line: [[@LINE-49]]
-// CHECK: ![[DI1]] = {{.*}}line: [[@LINE-60]]
-// CHECK: ![[DI2]] = {{.*}}line: [[@LINE-71]]
-// CHECK: ![[DI3]] = {{.*}}line: [[@LINE-52]]
-// CHECK: ![[DI5]] = {{.*}}line: [[@LINE-83]]
+// CHECK-DAG: ![[DI0]] = {{.*}}line: [[@LINE-49]]
+// CHECK-DAG: ![[DI1]] = {{.*}}line: [[@LINE-60]]
+// CHECK-DAG: ![[DI2]] = {{.*}}line: [[@LINE-71]]
+// CHECK-DAG: ![[DI3]] = {{.*}}line: [[@LINE-52]]
+// CHECK-DAG: ![[DI5]] = {{.*}}line: [[@LINE-83]]

diff --git a/clang/test/CodeGenCXX/sanitize-dtor-trivial-base.cpp b/clang/test/CodeGenCXX/sanitize-dtor-trivial-base.cpp
index cf5d0a2..5da9405 100644 (file)
--- a/clang/test/CodeGenCXX/sanitize-dtor-trivial-base.cpp
+++ b/clang/test/CodeGenCXX/sanitize-dtor-trivial-base.cpp
@@ -26,4 +26,4 @@ Derived d;
 
 // CHECK-LABEL: !DIFile{{.*}}cpp
 
-// CHECK: ![[DI]] = {{.*}}line: [[@LINE-14]]
+// CHECK-DAG: ![[DI]] = {{.*}}line: [[@LINE-14]]

diff --git a/clang/test/CodeGenCXX/sanitize-dtor-trivial.cpp b/clang/test/CodeGenCXX/sanitize-dtor-trivial.cpp
index 586df91..eb60f7f 100644 (file)
--- a/clang/test/CodeGenCXX/sanitize-dtor-trivial.cpp
+++ b/clang/test/CodeGenCXX/sanitize-dtor-trivial.cpp
@@ -14,12 +14,7 @@ Trivial t;
 
 // CHECK: call void @__sanitizer_dtor_callback({{.*}}, !dbg ![[DI:[0-9]+]]
 
-// CHECK-LABEL: !DIFile{{.*}}.cpp
-
-// CHECK: ![[DI]] = {{.*}}line: [[@LINE-371]]
 
 // CHECK-LABEL: !DIFile{{.*}}cpp
 
-// CHECK: ![[DI1]] = {{.*}}line: [[@LINE-28]]
-// CHECK: ![[DI2]] = {{.*}}line: [[@LINE-37]]
-// CHECK: ![[DI4]] = {{.*}}line: [[@LINE-30]]
+// CHECK-DAG: ![[DI]] = {{.*}}line: [[@LINE-28]]

diff --git a/clang/test/CodeGenCXX/sanitize-dtor-vtable.cpp b/clang/test/CodeGenCXX/sanitize-dtor-vtable.cpp
index 3cf91d9..063ff7f 100644 (file)
--- a/clang/test/CodeGenCXX/sanitize-dtor-vtable.cpp
+++ b/clang/test/CodeGenCXX/sanitize-dtor-vtable.cpp
@@ -41,6 +41,6 @@ B b;
 
 // CHECK-LABEL: !DIFile{{.*}}cpp
 
-// CHECK: ![[DI1]] = {{.*}}line: [[@LINE-28]]
-// CHECK: ![[DI2]] = {{.*}}line: [[@LINE-37]]
-// CHECK: ![[DI4]] = {{.*}}line: [[@LINE-30]]
+// CHECK-DAG: ![[DI1]] = {{.*}}line: [[@LINE-28]]
+// CHECK-DAG: ![[DI2]] = {{.*}}line: [[@LINE-37]]
+// CHECK-DAG: ![[DI4]] = {{.*}}line: [[@LINE-30]]