Modules: Teach the preprocessor to recognize 'import' only after an '@'.

The preprocessor currently recognizes module declarations to load a
module based on seeing the 'import' keyword followed by an
identifier. This sequence is fairly unlikely in C (one would need a
type named 'import'), but is more common in Objective-C (where a
variable named 'import' can cause problems). Since import declarations
currently require a leading '@', recognize that in the preprocessor as
well. Fixes <rdar://problem/15084587>.

llvm-svn: 194225

1 files changed, 9 insertions, 0 deletions

diff --git a/clang/test/Modules/import-decl.cpp b/clang/test/Modules/import-decl.cpp
index 900e090c0c5..56428b3eba6 100644
--- a/clang/test/Modules/import-decl.cpp
+++ b/clang/test/Modules/import-decl.cpp
@@ -8,3 +8,12 @@
 int main() {
   return 0;
 }
+
+// <rdar://problem/15084587>
+@interface A
+-method;
+@end
+
+void testImport(A *import) {
+  [import method];
+}