Reapply r176133 with testcase fixes.

llvm-svn: 176145
diff --git a/clang/test/CodeGenObjC/objc-literal-debugger-test.m b/clang/test/CodeGenObjC/objc-literal-debugger-test.m
index 437c99b..d4043aa 100644
--- a/clang/test/CodeGenObjC/objc-literal-debugger-test.m
+++ b/clang/test/CodeGenObjC/objc-literal-debugger-test.m
@@ -50,7 +50,6 @@
 #endif
 }
 
-// CHECK: declare i8* @objc_msgSend(i8*, i8*, ...) #1
+// CHECK: declare i8* @objc_msgSend(i8*, i8*, ...) [[NLB:#[0-9]+]]
 
-// CHECK: attributes #0 = { nounwind "target-features"={{.*}} }
-// CHECK: attributes #1 = { nonlazybind }
+// CHECK: attributes [[NLB]] = { nonlazybind }