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, 9 insertions, 4 deletions

diff --git a/clang/test/CodeGenObjCXX/lambda-expressions.mm b/clang/test/CodeGenObjCXX/lambda-expressions.mm
index 7c1e2e4f57f..ddc24a3bd29 100644
--- a/clang/test/CodeGenObjCXX/lambda-expressions.mm
+++ b/clang/test/CodeGenObjCXX/lambda-expressions.mm
@@ -25,19 +25,24 @@ typedef int (^fp)();
 fp global;
 void f2() { global = []{ return 3; }; }
 
-// MRC: define void @_Z2f2v() [[NUW:#[0-9]+]] {
+// MRC: define void @_Z2f2v() #1 {
 // MRC: store i8* bitcast (i32 (i8*)* @___Z2f2v_block_invoke to i8*),
 // MRC-NOT: call
 // MRC: ret void
 // ("global" contains a dangling pointer after this function runs.)
 
-// ARC: define void @_Z2f2v() [[NUW:#[0-9]+]] {
+// ARC: define void @_Z2f2v() #1 {
 // ARC: store i8* bitcast (i32 (i8*)* @___Z2f2v_block_invoke to i8*),
 // ARC: call i8* @objc_retainBlock
 // ARC: call void @objc_release
 // ARC: define internal i32 @___Z2f2v_block_invoke
 // ARC: call i32 @"_ZZ2f2vENK3$_1clEv
 
-// ARC: attributes [[NUW]] = { nounwind{{.*}} }
+// ARC: attributes #0 = { "target-features"={{.*}} }
+// ARC: attributes #1 = { nounwind "target-features"={{.*}} }
+// ARC: attributes #2 = { inlinehint nounwind "target-features"={{.*}} }
 
-// MRC: attributes [[NUW]] = { nounwind{{.*}} }
+// MRC: attributes #0 = { "target-features"={{.*}} }
+// MRC: attributes #1 = { nounwind "target-features"={{.*}} }
+// MRC: attributes #2 = { inlinehint nounwind "target-features"={{.*}} }
+// MRC: attributes #3 = { nonlazybind }