Revert r259624 - Make CF constant string decl visible to name lookup to fix module errors.

This breaks some internal bots in stage2: clang seg fault.
Looking with Ben to see what is going on.

llvm-svn: 259715

2 files changed, 8 insertions, 25 deletions

diff --git a/clang/test/Modules/Inputs/builtin.h b/clang/test/Modules/Inputs/builtin.h
index d8779452342..7be90177d19 100644
--- a/clang/test/Modules/Inputs/builtin.h
+++ b/clang/test/Modules/Inputs/builtin.h
@@ -1,10 +1,3 @@
 int i;
 int *p = &i;
 
-#ifdef __OBJC__
-void use_constant_string_builtins(void) {
-  (void)__builtin___CFStringMakeConstantString("");
-  (void)__builtin___NSStringMakeConstantString("");
-}
-#endif
-
diff --git a/clang/test/Modules/builtins.m b/clang/test/Modules/builtins.m
index a835039cc60..33d23979ce7 100644
--- a/clang/test/Modules/builtins.m
+++ b/clang/test/Modules/builtins.m
@@ -1,17 +1,3 @@
-// RUN: rm -rf %t
-// RUN: %clang_cc1 -fmodules-cache-path=%t -fmodules -fimplicit-module-maps -I %S/Inputs %s -verify
-
-// RUN: rm -rf %t.pch.cache
-// RUN: %clang_cc1 -fmodules-cache-path=%t.pch.cache -fmodules -fimplicit-module-maps -I %S/Inputs -emit-pch -o %t.pch -x objective-c-header %S/Inputs/use-builtin.h
-// RUN: %clang_cc1 -fmodules-cache-path=%t.pch.cache -fmodules -fimplicit-module-maps -I %S/Inputs %s -include-pch %t.pch %s -verify
-
-// expected-no-diagnostics
-
-void use_constant_string_builtins1(void) {
-  (void)__builtin___CFStringMakeConstantString("");
-  (void)__builtin___NSStringMakeConstantString("");
-}
-
 @import builtin;
 
 int foo() {
@@ -28,7 +14,11 @@ int baz() {
   return IS_CONST(0);
 }
 
-void use_constant_string_builtins2(void) {
-  (void)__builtin___CFStringMakeConstantString("");
-  (void)__builtin___NSStringMakeConstantString("");
-}
+// RUN: rm -rf %t
+// RUN: %clang_cc1 -fmodules-cache-path=%t -fmodules -fimplicit-module-maps -I %S/Inputs %s -verify
+
+// RUN: rm -rf %t.pch.cache
+// RUN: %clang_cc1 -fmodules-cache-path=%t.pch.cache -fmodules -fimplicit-module-maps -I %S/Inputs -emit-pch -o %t.pch -x objective-c-header %S/Inputs/use-builtin.h
+// RUN: %clang_cc1 -fmodules-cache-path=%t.pch.cache -fmodules -fimplicit-module-maps -I %S/Inputs %s -include-pch %t.pch %s -verify
+
+// expected-no-diagnostics