diff options
Diffstat (limited to 'test')
31 files changed, 129 insertions, 191 deletions
diff --git a/test/CodeGen/address-safety-attr.cpp b/test/CodeGen/address-safety-attr.cpp index c9f6ddcab4..29ba5a8375 100644 --- a/test/CodeGen/address-safety-attr.cpp +++ b/test/CodeGen/address-safety-attr.cpp @@ -47,15 +47,12 @@ int force_instance = TemplateAddressSafetyOk<42>() // Check that __cxx_global_var_init* get the sanitize_address 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]+]] -// ASAN: @__cxx_global_var_init{{.*}}#[[GVI:[0-9]+]] +// WITHOUT: @__cxx_global_var_init{{.*}}#[[NOATTR]] +// BL: @__cxx_global_var_init{{.*}}#[[NOATTR]] +// ASAN: @__cxx_global_var_init{{.*}}#[[WITH]] // WITHOUT: attributes #[[NOATTR]] = { nounwind{{.*}} } -// WITHOUT: attributes #[[GVI]] = { nounwind{{.*}} } // BL: attributes #[[NOATTR]] = { nounwind{{.*}} } -// BL: attributes #[[GVI]] = { nounwind{{.*}} } // ASAN: attributes #[[NOATTR]] = { nounwind{{.*}} } // ASAN: attributes #[[WITH]] = {{.*}}sanitize_address -// ASAN: attributes #[[GVI]] = {{.*}}sanitize_address diff --git a/test/CodeGen/function-attributes.c b/test/CodeGen/function-attributes.c index 25ca9163a1..8ad00fa80d 100644 --- a/test/CodeGen/function-attributes.c +++ b/test/CodeGen/function-attributes.c @@ -43,7 +43,7 @@ void f9b(void) { f9a(); } // FIXME: We should be setting nounwind on calls. // CHECK: call i32 @f10_t() -// CHECK: [[NUW_RN:#[0-9]+]] +// CHECK: [[NUW]] // CHECK: { int __attribute__((const)) f10_t(void); int f10(void) { return f10_t(); } @@ -119,8 +119,6 @@ void f19(void) { // CHECK: attributes [[NUW]] = { nounwind optsize readnone{{.*}} } // CHECK: attributes [[AI]] = { alwaysinline nounwind optsize readnone{{.*}} } -// CHECK: attributes [[ALIGN]] = { nounwind optsize readnone alignstack=16{{.*}} } -// CHECK: attributes [[RT]] = { nounwind optsize returns_twice{{.*}} } // CHECK: attributes [[NR]] = { noreturn nounwind optsize } -// CHECK: attributes [[NUW_RN]] = { nounwind optsize readnone } -// CHECK: attributes [[RT_CALL]] = { nounwind optsize returns_twice } +// CHECK: attributes [[ALIGN]] = { nounwind optsize readnone alignstack=16{{.*}} } +// CHECK: attributes [[RT]] = { nounwind optsize returns_twice } diff --git a/test/CodeGen/libcalls.c b/test/CodeGen/libcalls.c index d882b0ef97..8f8e18226a 100644 --- a/test/CodeGen/libcalls.c +++ b/test/CodeGen/libcalls.c @@ -24,9 +24,9 @@ void test_sqrt(float a0, double a1, long double a2) { // CHECK-YES: declare float @sqrtf(float) // CHECK-YES: declare double @sqrt(double) // CHECK-YES: declare x86_fp80 @sqrtl(x86_fp80) -// CHECK-NO: declare float @sqrtf(float) [[NUW_RN1:#[0-9]+]] -// CHECK-NO: declare double @sqrt(double) [[NUW_RN1]] -// CHECK-NO: declare x86_fp80 @sqrtl(x86_fp80) [[NUW_RN1]] +// CHECK-NO: declare float @sqrtf(float) [[NUW_RN:#[0-9]+]] +// CHECK-NO: declare double @sqrt(double) [[NUW_RN]] +// CHECK-NO: declare x86_fp80 @sqrtl(x86_fp80) [[NUW_RN]] // CHECK-YES: define void @test_pow // CHECK-NO: define void @test_pow @@ -81,9 +81,9 @@ void test_builtins(double d, float f, long double ld) { double atan_ = atan(d); long double atanl_ = atanl(ld); float atanf_ = atanf(f); -// CHECK-NO: declare double @atan(double) [[NUW_RN1]] -// CHECK-NO: declare x86_fp80 @atanl(x86_fp80) [[NUW_RN1]] -// CHECK-NO: declare float @atanf(float) [[NUW_RN1]] +// CHECK-NO: declare double @atan(double) [[NUW_RN]] +// CHECK-NO: declare x86_fp80 @atanl(x86_fp80) [[NUW_RN]] +// CHECK-NO: declare float @atanf(float) [[NUW_RN]] // CHECK-YES-NOT: declare double @atan(double) [[NUW_RN]] // CHECK-YES-NOT: declare x86_fp80 @atanl(x86_fp80) [[NUW_RN]] // CHECK-YES-NOT: declare float @atanf(float) [[NUW_RN]] @@ -91,9 +91,9 @@ void test_builtins(double d, float f, long double ld) { double atan2_ = atan2(d, 2); long double atan2l_ = atan2l(ld, ld); float atan2f_ = atan2f(f, f); -// CHECK-NO: declare double @atan2(double, double) [[NUW_RN1]] -// CHECK-NO: declare x86_fp80 @atan2l(x86_fp80, x86_fp80) [[NUW_RN1]] -// CHECK-NO: declare float @atan2f(float, float) [[NUW_RN1]] +// CHECK-NO: declare double @atan2(double, double) [[NUW_RN]] +// CHECK-NO: declare x86_fp80 @atan2l(x86_fp80, x86_fp80) [[NUW_RN]] +// CHECK-NO: declare float @atan2f(float, float) [[NUW_RN]] // CHECK-YES-NOT: declare double @atan2(double, double) [[NUW_RN]] // CHECK-YES-NOT: declare x86_fp80 @atan2l(x86_fp80, x86_fp80) [[NUW_RN]] // CHECK-YES-NOT: declare float @atan2f(float, float) [[NUW_RN]] @@ -101,9 +101,9 @@ void test_builtins(double d, float f, long double ld) { double exp_ = exp(d); long double expl_ = expl(ld); float expf_ = expf(f); -// CHECK-NO: declare double @exp(double) [[NUW_RN1]] -// CHECK-NO: declare x86_fp80 @expl(x86_fp80) [[NUW_RN1]] -// CHECK-NO: declare float @expf(float) [[NUW_RN1]] +// CHECK-NO: declare double @exp(double) [[NUW_RN]] +// CHECK-NO: declare x86_fp80 @expl(x86_fp80) [[NUW_RN]] +// CHECK-NO: declare float @expf(float) [[NUW_RN]] // CHECK-YES-NOT: declare double @exp(double) [[NUW_RN]] // CHECK-YES-NOT: declare x86_fp80 @expl(x86_fp80) [[NUW_RN]] // CHECK-YES-NOT: declare float @expf(float) [[NUW_RN]] @@ -111,9 +111,9 @@ void test_builtins(double d, float f, long double ld) { double log_ = log(d); long double logl_ = logl(ld); float logf_ = logf(f); -// CHECK-NO: declare double @log(double) [[NUW_RN1]] -// CHECK-NO: declare x86_fp80 @logl(x86_fp80) [[NUW_RN1]] -// CHECK-NO: declare float @logf(float) [[NUW_RN1]] +// CHECK-NO: declare double @log(double) [[NUW_RN]] +// CHECK-NO: declare x86_fp80 @logl(x86_fp80) [[NUW_RN]] +// CHECK-NO: declare float @logf(float) [[NUW_RN]] // CHECK-YES-NOT: declare double @log(double) [[NUW_RN]] // CHECK-YES-NOT: declare x86_fp80 @logl(x86_fp80) [[NUW_RN]] // CHECK-YES-NOT: declare float @logf(float) [[NUW_RN]] @@ -121,6 +121,5 @@ void test_builtins(double d, float f, long double ld) { // CHECK-YES: attributes [[NUW_RN]] = { nounwind readnone } -// CHECK-NO: attributes [[NUW_RN1]] = { nounwind readnone{{.*}} } +// CHECK-NO: attributes [[NUW_RN]] = { nounwind readnone{{.*}} } // CHECK-NO: attributes [[NUW_RO]] = { nounwind readonly } -// CHECK-NO: attributes [[NUW_RN2]] = { nounwind readnone } diff --git a/test/CodeGen/mips-vector-arg.c b/test/CodeGen/mips-vector-arg.c index 3202ebd630..6ffb043188 100644 --- a/test/CodeGen/mips-vector-arg.c +++ b/test/CodeGen/mips-vector-arg.c @@ -8,26 +8,24 @@ typedef float v4sf __attribute__ ((__vector_size__ (16))); typedef int v4i32 __attribute__ ((__vector_size__ (16))); -// O32: define void @test_v4sf(i32 %a1.coerce0, i32 %a1.coerce1, i32 %a1.coerce2, i32 %a1.coerce3, i32 %a2, i32, i32 %a3.coerce0, i32 %a3.coerce1, i32 %a3.coerce2, i32 %a3.coerce3) [[NUW1:#[0-9]+]] +// O32: define void @test_v4sf(i32 %a1.coerce0, i32 %a1.coerce1, i32 %a1.coerce2, i32 %a1.coerce3, i32 %a2, i32, i32 %a3.coerce0, i32 %a3.coerce1, i32 %a3.coerce2, i32 %a3.coerce3) [[NUW:#[0-9]+]] // O32: declare i32 @test_v4sf_2(i32, i32, i32, i32, i32, i32, i32, i32, i32, i32) -// N64: define void @test_v4sf(i64 %a1.coerce0, i64 %a1.coerce1, i32 %a2, i64, i64 %a3.coerce0, i64 %a3.coerce1) [[NUW1:#[0-9]+]] +// N64: define void @test_v4sf(i64 %a1.coerce0, i64 %a1.coerce1, i32 %a2, i64, i64 %a3.coerce0, i64 %a3.coerce1) [[NUW:#[0-9]+]] // N64: declare i32 @test_v4sf_2(i64, i64, i32, i64, i64, i64) extern test_v4sf_2(v4sf, int, v4sf); void test_v4sf(v4sf a1, int a2, v4sf a3) { test_v4sf_2(a3, a2, a1); } -// O32: define void @test_v4i32(i32 %a1.coerce0, i32 %a1.coerce1, i32 %a1.coerce2, i32 %a1.coerce3, i32 %a2, i32, i32 %a3.coerce0, i32 %a3.coerce1, i32 %a3.coerce2, i32 %a3.coerce3) [[NUW2:#[0-9]+]] +// O32: define void @test_v4i32(i32 %a1.coerce0, i32 %a1.coerce1, i32 %a1.coerce2, i32 %a1.coerce3, i32 %a2, i32, i32 %a3.coerce0, i32 %a3.coerce1, i32 %a3.coerce2, i32 %a3.coerce3) [[NUW]] // O32: declare i32 @test_v4i32_2(i32, i32, i32, i32, i32, i32, i32, i32, i32, i32) -// N64: define void @test_v4i32(i64 %a1.coerce0, i64 %a1.coerce1, i32 %a2, i64, i64 %a3.coerce0, i64 %a3.coerce1) [[NUW2:#[0-9]+]] +// N64: define void @test_v4i32(i64 %a1.coerce0, i64 %a1.coerce1, i32 %a2, i64, i64 %a3.coerce0, i64 %a3.coerce1) [[NUW]] // N64: declare i32 @test_v4i32_2(i64, i64, i32, i64, i64, i64) extern test_v4i32_2(v4i32, int, v4i32); void test_v4i32(v4i32 a1, int a2, v4i32 a3) { test_v4i32_2(a3, a2, a1); } -// O32: attributes [[NUW1]] = { nounwind{{.*}} } -// O32: attributes [[NUW2]] = { nounwind{{.*}} } +// O32: attributes [[NUW]] = { nounwind{{.*}} } -// N64: attributes [[NUW1]] = { nounwind{{.*}} } -// N64: attributes [[NUW2]] = { nounwind{{.*}} } +// N64: attributes [[NUW]] = { nounwind{{.*}} } diff --git a/test/CodeGen/sanitize-thread-attr.cpp b/test/CodeGen/sanitize-thread-attr.cpp index 09f4db5750..2dec3c48c6 100644 --- a/test/CodeGen/sanitize-thread-attr.cpp +++ b/test/CodeGen/sanitize-thread-attr.cpp @@ -46,15 +46,12 @@ int force_instance = TemplateTSANOk<42>() // 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 diff --git a/test/CodeGen/unwind-attr.c b/test/CodeGen/unwind-attr.c index 2ffb5a8eeb..1a7d3cdd1c 100644 --- a/test/CodeGen/unwind-attr.c +++ b/test/CodeGen/unwind-attr.c @@ -3,7 +3,7 @@ int opaque(); -// CHECK: define [[INT:i.*]] @test0() [[NONE:#[0-9]+]] { +// CHECK: define [[INT:i.*]] @test0() { // CHECK-NOEXC: define [[INT:i.*]] @test0() [[NUW:#[0-9]+]] { int test0(void) { return opaque(); @@ -17,13 +17,12 @@ int test1(void) { } // <rdar://problem/8283071>: not for weak functions -// CHECK: define weak [[INT:i.*]] @test2() [[NONE]] { +// CHECK: define weak [[INT:i.*]] @test2() { // CHECK-NOEXC: define weak [[INT:i.*]] @test2() [[NUW]] { __attribute__((weak)) int test2(void) { return 0; } -// CHECK: attributes [[NONE]] = { {{.*}} } // CHECK: attributes [[NUW]] = { nounwind{{.*}} } // CHECK-NOEXC: attributes [[NUW]] = { nounwind{{.*}} } diff --git a/test/CodeGenCXX/2009-05-04-PureConstNounwind.cpp b/test/CodeGenCXX/2009-05-04-PureConstNounwind.cpp index fc0d3f64c6..6b61d92580 100644 --- a/test/CodeGenCXX/2009-05-04-PureConstNounwind.cpp +++ b/test/CodeGenCXX/2009-05-04-PureConstNounwind.cpp @@ -3,19 +3,16 @@ int c(void) __attribute__((const)); int p(void) __attribute__((pure)); int t(void); -// CHECK: define i32 @_Z1fv() {{.*}} { +// CHECK: define i32 @_Z1fv() { int f(void) { // CHECK: call i32 @_Z1cv() [[NUW_RN:#[0-9]+]] // CHECK: call i32 @_Z1pv() [[NUW_RO:#[0-9]+]] return c() + p() + t(); } -// CHECK: declare i32 @_Z1cv() #1 -// CHECK: declare i32 @_Z1pv() #2 -// CHECK: declare i32 @_Z1tv() #0 +// CHECK: declare i32 @_Z1cv() #0 +// CHECK: declare i32 @_Z1pv() #1 +// CHECK: declare i32 @_Z1tv() -// CHECK: attributes #0 = { "target-features"={{.*}} } -// CHECK: attributes #1 = { nounwind readnone "target-features"={{.*}} } -// CHECK: attributes #2 = { nounwind readonly "target-features"={{.*}} } // CHECK: attributes [[NUW_RN]] = { nounwind readnone } // CHECK: attributes [[NUW_RO]] = { nounwind readonly } diff --git a/test/CodeGenCXX/attr.cpp b/test/CodeGenCXX/attr.cpp index 238019ceb6..6db214e327 100644 --- a/test/CodeGenCXX/attr.cpp +++ b/test/CodeGenCXX/attr.cpp @@ -2,7 +2,7 @@ // CHECK: @test2 = alias i32 ()* @_Z5test1v -// CHECK: define i32 @_Z3foov() #0 align 1024 +// CHECK: define i32 @_Z3foov() [[NUW:#[0-9]+]] align 1024 int foo() __attribute__((aligned(1024))); int foo() { } @@ -13,16 +13,16 @@ class C { void bar4() __attribute__((aligned(1024))); } c; -// CHECK: define void @_ZN1C4bar1Ev(%class.C* %this) unnamed_addr #0 align 2 +// CHECK: define void @_ZN1C4bar1Ev(%class.C* %this) unnamed_addr [[NUW]] align 2 void C::bar1() { } -// CHECK: define void @_ZN1C4bar2Ev(%class.C* %this) unnamed_addr #0 align 2 +// CHECK: define void @_ZN1C4bar2Ev(%class.C* %this) unnamed_addr [[NUW]] align 2 void C::bar2() { } -// CHECK: define void @_ZN1C4bar3Ev(%class.C* %this) unnamed_addr #0 align 1024 +// CHECK: define void @_ZN1C4bar3Ev(%class.C* %this) unnamed_addr [[NUW]] align 1024 void C::bar3() { } -// CHECK: define void @_ZN1C4bar4Ev(%class.C* %this) #0 align 1024 +// CHECK: define void @_ZN1C4bar4Ev(%class.C* %this) [[NUW]] align 1024 void C::bar4() { } // PR6635 @@ -31,7 +31,4 @@ int test1() { return 10; } // CHECK at top of file extern "C" int test2() __attribute__((alias("_Z5test1v"))); -// CHECK: attributes #0 = { nounwind "target-features"={{.*}} } -// CHECK: attributes #1 = { noreturn nounwind } -// CHECK: attributes #2 = { nounwind } -// CHECK: attributes #3 = { inlinehint nounwind "target-features"={{.*}} } +// CHECK: attributes [[NUW]] = { nounwind } diff --git a/test/CodeGenCXX/cxx11-exception-spec.cpp b/test/CodeGenCXX/cxx11-exception-spec.cpp index 3942ab79aa..5fd1fd8f14 100644 --- a/test/CodeGenCXX/cxx11-exception-spec.cpp +++ b/test/CodeGenCXX/cxx11-exception-spec.cpp @@ -10,99 +10,99 @@ template<typename T> struct S { static void g() noexcept(sizeof(T) == 4); }; -// CHECK: define {{.*}} @_Z1fIsEvv() #0 { +// CHECK: define {{.*}} @_Z1fIsEvv() { template<> void f<short>() { h(); } -// CHECK: define {{.*}} @_Z1fIA2_sEvv() #1 { +// CHECK: define {{.*}} @_Z1fIA2_sEvv() [[NUW:#[0-9]+]] { template<> void f<short[2]>() noexcept { h(); } // CHECK: define {{.*}} @_ZN1SIsE1fEv() -// CHECK-NOT: #1 +// CHECK-NOT: [[NUW]] template<> void S<short>::f() { h(); } -// CHECK: define {{.*}} @_ZN1SIA2_sE1fEv() #1 +// CHECK: define {{.*}} @_ZN1SIA2_sE1fEv() [[NUW]] template<> void S<short[2]>::f() noexcept { h(); } -// CHECK: define {{.*}} @_Z1fIDsEvv() #0 { +// CHECK: define {{.*}} @_Z1fIDsEvv() { template void f<char16_t>(); -// CHECK: define {{.*}} @_Z1fIA2_DsEvv() #1 { +// CHECK: define {{.*}} @_Z1fIA2_DsEvv() [[NUW]] { template void f<char16_t[2]>(); // CHECK: define {{.*}} @_ZN1SIDsE1fEv() -// CHECK-NOT: #1 +// CHECK-NOT: [[NUW]] template void S<char16_t>::f(); -// CHECK: define {{.*}} @_ZN1SIA2_DsE1fEv() #1 +// CHECK: define {{.*}} @_ZN1SIA2_DsE1fEv() [[NUW]] template void S<char16_t[2]>::f(); void h() { - // CHECK: define {{.*}} @_Z1fIiEvv() #1 { + // CHECK: define {{.*}} @_Z1fIiEvv() [[NUW]] { f<int>(); - // CHECK: define {{.*}} @_Z1fIA2_iEvv() #0 { + // CHECK: define {{.*}} @_Z1fIA2_iEvv() { f<int[2]>(); - // CHECK: define {{.*}} @_ZN1SIiE1fEv() #1 + // CHECK: define {{.*}} @_ZN1SIiE1fEv() [[NUW]] S<int>::f(); // CHECK: define {{.*}} @_ZN1SIA2_iE1fEv() - // CHECK-NOT: #1 + // CHECK-NOT: [[NUW]] S<int[2]>::f(); - // CHECK: define {{.*}} @_Z1fIfEvv() #1 { + // CHECK: define {{.*}} @_Z1fIfEvv() [[NUW]] { void (*f1)() = &f<float>; - // CHECK: define {{.*}} @_Z1fIdEvv() #0 { + // CHECK: define {{.*}} @_Z1fIdEvv() { void (*f2)() = &f<double>; - // CHECK: define {{.*}} @_ZN1SIfE1fEv() #1 + // CHECK: define {{.*}} @_ZN1SIfE1fEv() [[NUW]] void (*f3)() = &S<float>::f; // CHECK: define {{.*}} @_ZN1SIdE1fEv() - // CHECK-NOT: #1 + // CHECK-NOT: [[NUW]] void (*f4)() = &S<double>::f; - // CHECK: define {{.*}} @_Z1fIA4_cEvv() #1 { + // CHECK: define {{.*}} @_Z1fIA4_cEvv() [[NUW]] { (void)&f<char[4]>; - // CHECK: define {{.*}} @_Z1fIcEvv() #0 { + // CHECK: define {{.*}} @_Z1fIcEvv() { (void)&f<char>; - // CHECK: define {{.*}} @_ZN1SIA4_cE1fEv() #1 + // CHECK: define {{.*}} @_ZN1SIA4_cE1fEv() [[NUW]] (void)&S<char[4]>::f; // CHECK: define {{.*}} @_ZN1SIcE1fEv() - // CHECK-NOT: #1 + // CHECK-NOT: [[NUW]] (void)&S<char>::f; } // CHECK: define {{.*}} @_Z1iv void i() { - // CHECK: declare {{.*}} @_Z1gIiEvv() #1 + // CHECK: declare {{.*}} @_Z1gIiEvv() [[NUW]] g<int>(); // CHECK: declare {{.*}} @_Z1gIA2_iEvv() - // CHECK-NOT: #1 + // CHECK-NOT: [[NUW]] g<int[2]>(); - // CHECK: declare {{.*}} @_ZN1SIiE1gEv() #1 + // CHECK: declare {{.*}} @_ZN1SIiE1gEv() [[NUW]] S<int>::g(); // CHECK: declare {{.*}} @_ZN1SIA2_iE1gEv() - // CHECK-NOT: #1 + // CHECK-NOT: [[NUW]] S<int[2]>::g(); - // CHECK: declare {{.*}} @_Z1gIfEvv() #1 + // CHECK: declare {{.*}} @_Z1gIfEvv() [[NUW]] void (*g1)() = &g<float>; // CHECK: declare {{.*}} @_Z1gIdEvv() - // CHECK-NOT: #1 + // CHECK-NOT: [[NUW]] void (*g2)() = &g<double>; - // CHECK: declare {{.*}} @_ZN1SIfE1gEv() #1 + // CHECK: declare {{.*}} @_ZN1SIfE1gEv() [[NUW]] void (*g3)() = &S<float>::g; // CHECK: declare {{.*}} @_ZN1SIdE1gEv() - // CHECK-NOT: #1 + // CHECK-NOT: [[NUW]] void (*g4)() = &S<double>::g; - // CHECK: declare {{.*}} @_Z1gIA4_cEvv() #1 + // CHECK: declare {{.*}} @_Z1gIA4_cEvv() [[NUW]] (void)&g<char[4]>; // CHECK: declare {{.*}} @_Z1gIcEvv() - // CHECK-NOT: #1 + // CHECK-NOT: [[NUW]] (void)&g<char>; - // CHECK: declare {{.*}} @_ZN1SIA4_cE1gEv() #1 + // CHECK: declare {{.*}} @_ZN1SIA4_cE1gEv() [[NUW]] (void)&S<char[4]>::g; // CHECK: declare {{.*}} @_ZN1SIcE1gEv() - // CHECK-NOT: #1 + // CHECK-NOT: [[NUW]] (void)&S<char>::g; } @@ -113,12 +113,10 @@ template<typename T> struct Nested { // CHECK: define {{.*}} @_Z1jv void j() { // CHECK: declare {{.*}} @_ZN6NestedIiE1fILb1EcEEvv( - // CHECK-NOT: #1 + // CHECK-NOT: [[NUW]] Nested<int>().f<true, char>(); - // CHECK: declare {{.*}} @_ZN6NestedIlE1fILb0ElEEvv({{.*}}) #1 + // CHECK: declare {{.*}} @_ZN6NestedIlE1fILb0ElEEvv({{.*}}) [[NUW]] Nested<long>().f<false, long>(); } -// CHECK: attributes #0 = { "target-features"={{.*}} } -// CHECK: attributes #1 = { nounwind "target-features"={{.*}} } -// CHECK: attributes #2 = { noinline noreturn nounwind } +// CHECK: attributes [[NUW]] = { nounwind } diff --git a/test/CodeGenCXX/default-destructor-synthesis.cpp b/test/CodeGenCXX/default-destructor-synthesis.cpp index d5f57215df..f9e13eb526 100644 --- a/test/CodeGenCXX/default-destructor-synthesis.cpp +++ b/test/CodeGenCXX/default-destructor-synthesis.cpp @@ -35,4 +35,4 @@ int f() { return count; } -// CHECK: attributes #0 = { nounwind "target-features"={{.*}} } +// CHECK: attributes #0 = { nounwind{{.*}} } diff --git a/test/CodeGenCXX/derived-to-base.cpp b/test/CodeGenCXX/derived-to-base.cpp index 1c9cdbc982..fa03fee8d6 100644 --- a/test/CodeGenCXX/derived-to-base.cpp +++ b/test/CodeGenCXX/derived-to-base.cpp @@ -46,5 +46,4 @@ namespace test3 { } } -// CHECK: attributes #0 = { nounwind "target-features"={{.*}} } -// CHECK: attributes #1 = { "target-features"={{.*}} } +// CHECK: attributes #0 = { nounwind{{.*}} } diff --git a/test/CodeGenCXX/dynamic-cast.cpp b/test/CodeGenCXX/dynamic-cast.cpp index 016cfb14f6..fe85e212b6 100644 --- a/test/CodeGenCXX/dynamic-cast.cpp +++ b/test/CodeGenCXX/dynamic-cast.cpp @@ -17,6 +17,7 @@ const B& f(A *a) { return fail; } -// CHECK: declare i8* @__dynamic_cast(i8*, i8*, i8*, i64) #2 +// CHECK: declare i8* @__dynamic_cast(i8*, i8*, i8*, i64) [[NUW_RO:#[0-9]+]] +// CHECK: attributes [[NUW_RO]] = { nounwind readonly } // CHECK: attributes [[NR]] = { noreturn } diff --git a/test/CodeGenCXX/exceptions.cpp b/test/CodeGenCXX/exceptions.cpp index ac52d70a6b..fb0a9b2e5e 100644 --- a/test/CodeGenCXX/exceptions.cpp +++ b/test/CodeGenCXX/exceptions.cpp @@ -71,7 +71,7 @@ namespace test1 { // rdar://11904428 // Terminate landing pads should call __cxa_begin_catch first. - // CHECK: define linkonce_odr hidden void @__clang_call_terminate(i8*) #2 + // CHECK: define linkonce_odr hidden void @__clang_call_terminate(i8*) [[NI_NR_NUW:#[0-9]+]] // CHECK-NEXT: [[T0:%.*]] = call i8* @__cxa_begin_catch(i8* %0) [[NUW:#[0-9]+]] // CHECK-NEXT: call void @_ZSt9terminatev() [[NR_NUW:#[0-9]+]] // CHECK-NEXT: unreachable @@ -526,10 +526,6 @@ namespace test11 { // (After this is a terminate landingpad.) } -// CHECK: attributes #0 = { "target-features"={{.*}} } -// CHECK: attributes #1 = { nounwind "target-features"={{.*}} } -// CHECK: attributes #2 = { noinline noreturn nounwind } -// CHECK: attributes #3 = { nounwind readnone } - // CHECK: attributes [[NUW]] = { nounwind } +// CHECK: attributes [[NI_NR_NUW]] = { noinline noreturn nounwind } // CHECK: attributes [[NR_NUW]] = { noreturn nounwind } diff --git a/test/CodeGenCXX/global-dtor-no-atexit.cpp b/test/CodeGenCXX/global-dtor-no-atexit.cpp index 40be07a441..0b323e9a42 100644 --- a/test/CodeGenCXX/global-dtor-no-atexit.cpp +++ b/test/CodeGenCXX/global-dtor-no-atexit.cpp @@ -44,5 +44,3 @@ void func() { } // CHECK: attributes #0 = { nounwind } -// CHECK: attributes #1 = { "target-features"={{.*}} } -// CHECK: attributes #2 = { nounwind "target-features"={{.*}} } diff --git a/test/CodeGenCXX/global-init.cpp b/test/CodeGenCXX/global-init.cpp index ddad2d2ebc..426cf9c10e 100644 --- a/test/CodeGenCXX/global-init.cpp +++ b/test/CodeGenCXX/global-init.cpp @@ -200,15 +200,6 @@ namespace test7 { // CHECK: call void [[TEST1_Z_INIT]] // rdar://problem/8090834: this should be nounwind -// CHECK-NOEXC: define internal void @_GLOBAL__I_a() #0 section "__TEXT,__StaticInit,regular,pure_instructions" { - -// CHECK: attributes #0 = { "target-features"={{.*}} } -// CHECK: attributes #1 = { nounwind } -// CHECK: attributes #2 = { nounwind "target-features"={{.*}} } -// CHECK: attributes #3 = { noinline noreturn nounwind } -// CHECK: attributes #4 = { nounwind readonly } - -// CHECK-NOEXC: attributes #0 = { nounwind } -// CHECK-NOEXC: attributes #1 = { "target-features"={{.*}} } -// CHECK-NOEXC: attributes #2 = { nounwind "target-features"={{.*}} } -// CHECK-NOEXC: attributes #3 = { nounwind readonly } +// CHECK-NOEXC: define internal void @_GLOBAL__I_a() [[NUW:#[0-9]+]] section "__TEXT,__StaticInit,regular,pure_instructions" { + +// CHECK-NOEXC: attributes [[NUW]] = { nounwind } diff --git a/test/CodeGenCXX/member-initializers.cpp b/test/CodeGenCXX/member-initializers.cpp index 9a5a79fca3..69a63b2e44 100644 --- a/test/CodeGenCXX/member-initializers.cpp +++ b/test/CodeGenCXX/member-initializers.cpp @@ -32,4 +32,4 @@ int test_fold() { return A(2).i; } -// CHECK: attributes #0 = { nounwind readnone "target-features"={{.*}} } +// CHECK: attributes #0 = { nounwind readnone{{.*}} } diff --git a/test/CodeGenCXX/microsoft-abi-array-cookies.cpp b/test/CodeGenCXX/microsoft-abi-array-cookies.cpp index 31533ddccd..c0bbbaf2f8 100644 --- a/test/CodeGenCXX/microsoft-abi-array-cookies.cpp +++ b/test/CodeGenCXX/microsoft-abi-array-cookies.cpp @@ -58,5 +58,4 @@ void check_array_cookies_aligned() { // CHECK: getelementptr inbounds i8* [[ARRAY_AS_CHAR]], i64 -8 } -// CHECK: attributes #0 = { nounwind "target-features"={{.*}} } -// CHECK: attributes #1 = { "target-features"={{.*}} } +// CHECK: attributes #0 = { nounwind{{.*}} } diff --git a/test/CodeGenCXX/microsoft-abi-static-initializers.cpp b/test/CodeGenCXX/microsoft-abi-static-initializers.cpp index 112228a9d9..35e343bc4d 100644 --- a/test/CodeGenCXX/microsoft-abi-static-initializers.cpp +++ b/test/CodeGenCXX/microsoft-abi-static-initializers.cpp @@ -5,12 +5,12 @@ struct S { ~S() {} } s; -// CHECK: define internal void [[INIT_s:@.*global_var.*]] #0 +// CHECK: define internal void [[INIT_s:@.*global_var.*]] [[NUW:#[0-9]+]] // CHECK: %{{[.0-9A-Z_a-z]+}} = call x86_thiscallcc %struct.S* @"\01??0S@@QAE@XZ" // CHECK: call i32 @atexit(void ()* @"__dtor_\01?s@@3US@@A") // CHECK: ret void -// CHECK: define internal void @"__dtor_\01?s@@3US@@A"() #0 { +// CHECK: define internal void @"__dtor_\01?s@@3US@@A"() [[NUW]] { // CHECK: call x86_thiscallcc void @"\01??1S@@QAE@XZ" // CHECK: ret void @@ -33,7 +33,7 @@ void force_usage() { (void)B<int>::foo; // (void) - force usage } -// CHECK: define internal void [[INIT_foo:@.*global_var.*]] #0 +// CHECK: define internal void [[INIT_foo:@.*global_var.*]] [[NUW]] // CHECK: %{{[.0-9A-Z_a-z]+}} = call x86_thiscallcc %class.A* @"\01??0A@@QAE@XZ" // CHECK: call i32 @atexit(void ()* [[FOO_DTOR:@"__dtor_.*foo@.*]]) // CHECK: ret void @@ -46,10 +46,9 @@ void force_usage() { // CHECK: call x86_thiscallcc void @"\01??1A@@QAE@XZ"{{.*}}foo // CHECK: ret void -// CHECK: define internal void @_GLOBAL__I_a() #0 { +// CHECK: define internal void @_GLOBAL__I_a() [[NUW]] { // CHECK: call void [[INIT_s]] // CHECK: call void [[INIT_foo]] // CHECK: ret void -// CHECK: attributes #0 = { nounwind } -// CHECK: attributes #1 = { nounwind "target-features"={{.*}} } +// CHECK: attributes [[NUW]] = { nounwind } diff --git a/test/CodeGenCXX/no-exceptions.cpp b/test/CodeGenCXX/no-exceptions.cpp index 4264953b00..ecc5201138 100644 --- a/test/CodeGenCXX/no-exceptions.cpp +++ b/test/CodeGenCXX/no-exceptions.cpp @@ -2,7 +2,7 @@ void g(); -// CHECK: define void @_Z1fv() #0 +// CHECK: define void @_Z1fv() [[NUW:#[0-9]+]] void f() throw (int) { // CHECK-NOT: invoke void @_Z1gv @@ -11,5 +11,4 @@ void f() throw (int) { // CHECK: ret void } -// CHECK: attributes #0 = { nounwind "target-features"={{.*}} } -// CHECK: attributes #1 = { "target-features"={{.*}} } +// CHECK: attributes [[NUW]] = { nounwind } diff --git a/test/CodeGenCXX/pointers-to-data-members.cpp b/test/CodeGenCXX/pointers-to-data-members.cpp index a69093f8ce..841209e84e 100644 --- a/test/CodeGenCXX/pointers-to-data-members.cpp +++ b/test/CodeGenCXX/pointers-to-data-members.cpp @@ -151,13 +151,13 @@ struct A { A() : a() {} }; -// CHECK-O3: define zeroext i1 @_ZN6PR71395checkEv() #0 +// CHECK-O3: define zeroext i1 @_ZN6PR71395checkEv() [[NUW_RO:#[0-9]+]] bool check() { // CHECK-O3: ret i1 true return A().a.data == 0; } -// CHECK-O3: define zeroext i1 @_ZN6PR71396check2Ev() #0 +// CHECK-O3: define zeroext i1 @_ZN6PR71396check2Ev() [[NUW_RO]] bool check2() { // CHECK-O3: ret i1 true return ptr_to_member_type() == 0; @@ -255,7 +255,4 @@ namespace PR13097 { // CHECK: call void @_ZN7PR130971XC1ERKS0_ } -// CHECK-O3: attributes #0 = { nounwind readnone "target-features"={{.*}} } -// CHECK-O3: attributes #1 = { nounwind "target-features"={{.*}} } -// CHECK-O3: attributes #2 = { "target-features"={{.*}} } -// CHECK-O3: attributes #3 = { nounwind } +// CHECK-O3: attributes [[NUW_RO]] = { nounwind readnone{{.*}} } diff --git a/test/CodeGenCXX/reference-cast.cpp b/test/CodeGenCXX/reference-cast.cpp index ec4fdaf196..f440cf5a47 100644 --- a/test/CodeGenCXX/reference-cast.cpp +++ b/test/CodeGenCXX/reference-cast.cpp @@ -3,7 +3,7 @@ // PR6024 extern int i; -// CHECK: define i32* @_Z16lvalue_noop_castv() #0 +// CHECK: define i32* @_Z16lvalue_noop_castv() [[NUW:#[0-9]+]] const int &lvalue_noop_cast() { if (i == 0) // CHECK: store i32 17, i32* @@ -193,5 +193,4 @@ namespace PR10650 { // CHECK: store i64 } -// CHECK: attributes #0 = { nounwind "target-features"={{.*}} } -// CHECK: attributes #1 = { "target-features"={{.*}} } +// CHECK: attributes [[NUW]] = { nounwind } diff --git a/test/CodeGenCXX/threadsafe-statics.cpp b/test/CodeGenCXX/threadsafe-statics.cpp index a28d0fccbd..9e6550d094 100644 --- a/test/CodeGenCXX/threadsafe-statics.cpp +++ b/test/CodeGenCXX/threadsafe-statics.cpp @@ -6,7 +6,7 @@ int f(); // WITH-TSS: @_ZZ1gvE1a = internal global |