Reapply r176133 with testcase fixes.
llvm-svn: 176145
diff --git a/clang/test/CodeGenCXX/threadsafe-statics.cpp b/clang/test/CodeGenCXX/threadsafe-statics.cpp
index a28d0fc..9e6550d 100644
--- a/clang/test/CodeGenCXX/threadsafe-statics.cpp
+++ b/clang/test/CodeGenCXX/threadsafe-statics.cpp
@@ -6,7 +6,7 @@
// WITH-TSS: @_ZZ1gvE1a = internal global i32 0, align 4
// WITH-TSS: @_ZGVZ1gvE1a = internal global i64 0
-// WITH-TSS: define void @_Z1gv() #0
+// WITH-TSS: define void @_Z1gv() [[NUW:#[0-9]+]]
// WITH-TSS: call i32 @__cxa_guard_acquire
// WITH-TSS: call void @__cxa_guard_release
// WITH-TSS: ret void
@@ -17,14 +17,11 @@
// NO-TSS: @_ZZ1gvE1a = internal global i32 0, align 4
// NO-TSS: @_ZGVZ1gvE1a = internal global i8 0
-// NO-TSS: define void @_Z1gv() #0
+// NO-TSS: define void @_Z1gv() [[NUW:#[0-9]+]]
// NO-TSS-NOT: call i32 @__cxa_guard_acquire
// NO-TSS-NOT: call void @__cxa_guard_release
// NO-TSS: ret void
-// WITH-TSS: attributes #0 = { nounwind "target-features"={{.*}} }
-// WITH-TSS: attributes #1 = { nounwind }
-// WITH-TSS: attributes #2 = { "target-features"={{.*}} }
+// WITH-TSS: attributes [[NUW]] = { nounwind }
-// NO-TSS: attributes #0 = { nounwind "target-features"={{.*}} }
-// NO-TSS: attributes #1 = { "target-features"={{.*}} }
+// NO-TSS: attributes [[NUW]] = { nounwind }