Revert "Add more attributes from the command line to functions."

This reverts commit 176009.

The commit is a likely cause of several buildbot failures.

llvm-svn: 176044

1 files changed, 43 insertions, 40 deletions

diff --git a/clang/test/CodeGen/libcalls.c b/clang/test/CodeGen/libcalls.c
index d882b0ef971..eb233ba2954 100644
--- a/clang/test/CodeGen/libcalls.c
+++ b/clang/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) #1
+// CHECK-NO: declare double @sqrt(double) #1
+// CHECK-NO: declare x86_fp80 @sqrtl(x86_fp80) #1
 
 // CHECK-YES: define void @test_pow
 // CHECK-NO: define void @test_pow
@@ -47,9 +47,9 @@ void test_pow(float a0, double a1, long double a2) {
 // CHECK-YES: declare float @powf(float, float)
 // CHECK-YES: declare double @pow(double, double)
 // CHECK-YES: declare x86_fp80 @powl(x86_fp80, x86_fp80)
-// CHECK-NO: declare float @llvm.pow.f32(float, float) [[NUW_RO:#[0-9]+]]
-// CHECK-NO: declare double @llvm.pow.f64(double, double) [[NUW_RO]]
-// CHECK-NO: declare x86_fp80 @llvm.pow.f80(x86_fp80, x86_fp80) [[NUW_RO]]
+// CHECK-NO: declare float @llvm.pow.f32(float, float) #2
+// CHECK-NO: declare double @llvm.pow.f64(double, double) #2
+// CHECK-NO: declare x86_fp80 @llvm.pow.f80(x86_fp80, x86_fp80) #2
 
 // CHECK-YES: define void @test_fma
 // CHECK-NO: define void @test_fma
@@ -67,12 +67,12 @@ void test_fma(float a0, double a1, long double a2) {
     long double l2 = fmal(a2, a2, a2);
 }
 
-// CHECK-YES: declare float @llvm.fma.f32(float, float, float) [[NUW_RN:#[0-9]+]]
-// CHECK-YES: declare double @llvm.fma.f64(double, double, double) [[NUW_RN]]
-// CHECK-YES: declare x86_fp80 @llvm.fma.f80(x86_fp80, x86_fp80, x86_fp80) [[NUW_RN]]
-// CHECK-NO: declare float @llvm.fma.f32(float, float, float) [[NUW_RN2:#[0-9]+]]
-// CHECK-NO: declare double @llvm.fma.f64(double, double, double) [[NUW_RN2]]
-// CHECK-NO: declare x86_fp80 @llvm.fma.f80(x86_fp80, x86_fp80, x86_fp80) [[NUW_RN2]]
+// CHECK-YES: declare float @llvm.fma.f32(float, float, float) #2
+// CHECK-YES: declare double @llvm.fma.f64(double, double, double) #2
+// CHECK-YES: declare x86_fp80 @llvm.fma.f80(x86_fp80, x86_fp80, x86_fp80) #2
+// CHECK-NO: declare float @llvm.fma.f32(float, float, float) #3
+// CHECK-NO: declare double @llvm.fma.f64(double, double, double) #3
+// CHECK-NO: declare x86_fp80 @llvm.fma.f80(x86_fp80, x86_fp80, x86_fp80) #3
 
 // Just checking to make sure these library functions are marked readnone
 void test_builtins(double d, float f, long double ld) {
@@ -81,46 +81,49 @@ 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-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]]
+// CHECK-NO: declare double @atan(double) #1
+// CHECK-NO: declare x86_fp80 @atanl(x86_fp80) #1
+// CHECK-NO: declare float @atanf(float) #1
+// CHECK-YES-NOT: declare double @atan(double) #2
+// CHECK-YES-NOT: declare x86_fp80 @atanl(x86_fp80) #2
+// CHECK-YES-NOT: declare float @atanf(float) #2
 
   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-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]]
+// CHECK-NO: declare double @atan2(double, double) #1
+// CHECK-NO: declare x86_fp80 @atan2l(x86_fp80, x86_fp80) #1
+// CHECK-NO: declare float @atan2f(float, float) #1
+// CHECK-YES-NOT: declare double @atan2(double, double) #2
+// CHECK-YES-NOT: declare x86_fp80 @atan2l(x86_fp80, x86_fp80) #2
+// CHECK-YES-NOT: declare float @atan2f(float, float) #2
 
   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-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]]
+// CHECK-NO: declare double @exp(double) #1
+// CHECK-NO: declare x86_fp80 @expl(x86_fp80) #1
+// CHECK-NO: declare float @expf(float) #1
+// CHECK-YES-NOT: declare double @exp(double) #2
+// CHECK-YES-NOT: declare x86_fp80 @expl(x86_fp80) #2
+// CHECK-YES-NOT: declare float @expf(float) #2
 
   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-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]]
+// CHECK-NO: declare double @log(double) #1
+// CHECK-NO: declare x86_fp80 @logl(x86_fp80) #1
+// CHECK-NO: declare float @logf(float) #1
+// CHECK-YES-NOT: declare double @log(double) #2
+// CHECK-YES-NOT: declare x86_fp80 @logl(x86_fp80) #2
+// CHECK-YES-NOT: declare float @logf(float) #2
 }
 
-// CHECK-YES: attributes [[NUW_RN]] = { nounwind readnone }
+// CHECK-YES: attributes #0 = { nounwind "target-features"={{.*}} }
+// CHECK-YES: attributes #1 = { "target-features"={{.*}} }
+// CHECK-YES: attributes #2 = { nounwind readnone }
 
-// CHECK-NO: attributes [[NUW_RN1]] = { nounwind readnone{{.*}} }
-// CHECK-NO: attributes [[NUW_RO]] = { nounwind readonly }
-// CHECK-NO: attributes [[NUW_RN2]] = { nounwind readnone }
+// CHECK-NO: attributes #0 = { nounwind "target-features"={{.*}} }
+// CHECK-NO: attributes #1 = { nounwind readnone "target-features"={{.*}} }
+// CHECK-NO: attributes #2 = { nounwind readonly }
+// CHECK-NO: attributes #3 = { nounwind readnone }