aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Wendling <isanbard@gmail.com>2013-02-21 19:44:18 +0000
committerBill Wendling <isanbard@gmail.com>2013-02-21 19:44:18 +0000
commit478bbf3171cc6ed10e544440b72413b3fdfbb0b6 (patch)
tree8188a4e7fb83f453da027e0b7fdf73d7b47db4e4
parentc73dcba91872322159b94dc49afb9c86d169425e (diff)
Try to get buildbots to pass these tests.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@175784 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--test/CXX/special/class.dtor/p3-0x.cpp2
-rw-r--r--test/CodeGen/address-safety-attr.cpp21
2 files changed, 13 insertions, 10 deletions
diff --git a/test/CXX/special/class.dtor/p3-0x.cpp b/test/CXX/special/class.dtor/p3-0x.cpp
index c3d3f6ab36..dc76e00308 100644
--- a/test/CXX/special/class.dtor/p3-0x.cpp
+++ b/test/CXX/special/class.dtor/p3-0x.cpp
@@ -176,4 +176,4 @@ struct TVC : VX
template <typename T>
TVC<T>::~TVC() {}
-// CHECK: attributes [[ATTRGRP]] = { nounwind "target-features"={{.*}} }
+// CHECK: attributes [[ATTRGRP]] = { nounwind{{.*}} }
diff --git a/test/CodeGen/address-safety-attr.cpp b/test/CodeGen/address-safety-attr.cpp
index 827f8d15b4..5f098fd983 100644
--- a/test/CodeGen/address-safety-attr.cpp
+++ b/test/CodeGen/address-safety-attr.cpp
@@ -47,12 +47,15 @@ int force_instance = TemplateAddressSafetyOk<42>()
// Check that __cxx_global_var_init* get the address_safety attribute.
int global1 = 0;
int global2 = *(int*)((char*)&global1+1);
-// WITHOUT: @__cxx_global_var_init{{.*}}#1
-// BL: @__cxx_global_var_init{{.*}}#1
-// ASAN: @__cxx_global_var_init{{.*}}#2
-
-// WITHOUT: attributes #[[NOATTR]] = { nounwind "target-features"={{.*}} }
-// BL: attributes #[[NOATTR]] = { nounwind "target-features"={{.*}} }
-
-// ASAN: attributes #[[NOATTR]] = { nounwind "target-features"={{.*}} }
-// ASAN: attributes #[[WITH]] = { address_safety nounwind "target-features"={{.*}} }
+// WITHOUT: @__cxx_global_var_init{{.*}}#[[GVI:[0-9]+]]
+// BL: @__cxx_global_var_init{{.*}}#[[GVI:[0-9]+]]
+// ASAN: @__cxx_global_var_init{{.*}}#[[GVI:[0-9]+]]
+
+// WITHOUT: attributes #[[NOATTR]] = { nounwind{{.*}} }
+// WITHOUT: attributes #[[GVI]] = { nounwind{{.*}} }
+// BL: attributes #[[NOATTR]] = { nounwind{{.*}} }
+// BL: attributes #[[GVI]] = { nounwind{{.*}} }
+
+// ASAN: attributes #[[NOATTR]] = { nounwind{{.*}} }
+// ASAN: attributes #[[WITH]] = { address_safety nounwind{{.*}} }
+// ASAN: attributes #[[GVI]] = { address_safety nounwind{{.*}} }