Reapply r176133 with testcase fixes.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@176145 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/CodeGen/sanitize-thread-attr.cpp b/test/CodeGen/sanitize-thread-attr.cpp
index 09f4db5..2dec3c4 100644
--- a/test/CodeGen/sanitize-thread-attr.cpp
+++ b/test/CodeGen/sanitize-thread-attr.cpp
@@ -46,15 +46,12 @@
// Check that __cxx_global_var_init* get the sanitize_thread attribute.
int global1 = 0;
int global2 = *(int*)((char*)&global1+1);
-// WITHOUT: @__cxx_global_var_init{{.*}}#[[GVI:[0-9]+]]
-// BL: @__cxx_global_var_init{{.*}}#[[GVI:[0-9]+]]
-// TSAN: @__cxx_global_var_init{{.*}}#[[GVI:[0-9]+]]
+// WITHOUT: @__cxx_global_var_init{{.*}}#[[NOATTR]]
+// BL: @__cxx_global_var_init{{.*}}#[[NOATTR]]
+// TSAN: @__cxx_global_var_init{{.*}}#[[WITH]]
// WITHOUT: attributes #[[NOATTR]] = { nounwind{{.*}} }
-// WITHOUT: attributes #[[GVI]] = { nounwind{{.*}} }
// BL: attributes #[[NOATTR]] = { nounwind{{.*}} }
-// BL: attributes #[[GVI]] = { nounwind{{.*}} }
// TSAN: attributes #[[NOATTR]] = { nounwind{{.*}} }
// TSAN: attributes #[[WITH]] = { nounwind{{.*}} sanitize_thread
-// TSAN: attributes #[[GVI]] = { nounwind{{.*}} sanitize_thread