From 1b257afbae854c6817f26b7d61c4fed8ff7aebad Mon Sep 17 00:00:00 2001
From: Douglas Gregor <dgregor@apple.com>
Date: Tue, 11 Dec 2012 22:11:52 +0000
Subject: [PATCH] Use @import rather than @__experimental_modules_import, since
 the latter is rather a mess to type.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@169919 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/clang/AST/Decl.h                             |  2 +-
 include/clang/Basic/IdentifierTable.h                |  4 ++--
 include/clang/Basic/TokenKinds.def                   |  2 +-
 lib/AST/DeclPrinter.cpp                              |  2 +-
 lib/Basic/IdentifierTable.cpp                        |  2 +-
 lib/Lex/PPDirectives.cpp                             |  2 +-
 lib/Lex/Preprocessor.cpp                             |  4 ++--
 lib/Parse/ParseObjc.cpp                              |  2 +-
 lib/Parse/Parser.cpp                                 |  2 +-
 test/Index/annotate-module.m                         |  8 ++++----
 test/Index/complete-modules.m                        |  6 +++---
 test/Index/crash-recovery-modules.m                  |  4 ++--
 test/Index/index-module.m                            |  2 +-
 .../Headers/MutuallyRecursive1.h                     |  2 +-
 .../Headers/MutuallyRecursive2.h                     |  2 +-
 test/Modules/Inputs/category_bottom.h                |  4 ++--
 test/Modules/Inputs/category_left.h                  |  2 +-
 test/Modules/Inputs/category_other.h                 |  2 +-
 test/Modules/Inputs/category_right.h                 |  2 +-
 test/Modules/Inputs/diamond.h                        |  2 +-
 test/Modules/Inputs/diamond_bottom.h                 |  4 ++--
 test/Modules/Inputs/diamond_left.h                   |  2 +-
 test/Modules/Inputs/diamond_right.h                  |  2 +-
 test/Modules/Inputs/macros_left.h                    |  2 +-
 test/Modules/Inputs/macros_right.h                   |  2 +-
 test/Modules/Inputs/namespaces-left.h                |  2 +-
 test/Modules/Inputs/namespaces-right.h               |  2 +-
 test/Modules/Inputs/redecl-merge-bottom.h            |  4 ++--
 test/Modules/Inputs/redecl-merge-left-left.h         |  2 +-
 test/Modules/Inputs/redecl-merge-left.h              |  2 +-
 test/Modules/Inputs/redecl-merge-right.h             |  4 ++--
 test/Modules/Inputs/templates-left.h                 |  2 +-
 test/Modules/Inputs/templates-right.h                |  2 +-
 .../Inputs/wildcard-submodule-exports/C_one.h        |  4 ++--
 .../Inputs/wildcard-submodule-exports/C_two.h        |  4 ++--
 test/Modules/build-fail-notes.m                      |  6 +++---
 test/Modules/compiler_builtins.m                     |  4 ++--
 test/Modules/cstd.m                                  |  8 ++++----
 test/Modules/cycles.c                                |  8 ++++----
 test/Modules/decldef.mm                              |  4 ++--
 test/Modules/diamond.c                               |  2 +-
 test/Modules/epic-fail.m                             |  4 ++--
 test/Modules/header-import.m                         |  2 +-
 test/Modules/import-decl.cpp                         |  2 +-
 test/Modules/inferred-frameworks.m                   |  2 +-
 test/Modules/inferred-submodules.m                   |  4 ++--
 test/Modules/irgen.c                                 |  2 +-
 test/Modules/load_failure.c                          |  6 +++---
 test/Modules/lookup.cpp                              |  4 ++--
 test/Modules/lookup.m                                |  4 ++--
 test/Modules/macros.c                                |  8 ++++----
 test/Modules/method_pool.m                           |  4 ++--
 test/Modules/modify-module.m                         |  2 +-
 test/Modules/module-private.cpp                      |  4 ++--
 test/Modules/namespaces.cpp                          |  4 ++--
 test/Modules/normal-module-map.cpp                   | 12 ++++++------
 test/Modules/objc-categories.m                       |  4 ++--
 test/Modules/on-demand-build-warnings.m              |  2 +-
 test/Modules/on-demand-build.m                       |  4 ++--
 test/Modules/on-demand-macros.m                      |  2 +-
 test/Modules/redecl-merge.m                          |  8 ++++----
 test/Modules/redecl-namespaces.mm                    |  4 ++--
 test/Modules/redeclarations.m                        |  4 ++--
 test/Modules/requires.m                              |  2 +-
 test/Modules/subframeworks.m                         |  6 +++---
 test/Modules/submodules-preprocess.cpp               | 10 +++++-----
 test/Modules/submodules.cpp                          | 10 +++++-----
 test/Modules/submodules.m                            |  2 +-
 test/Modules/templates.mm                            |  4 ++--
 test/Modules/wildcard-submodule-exports.cpp          |  6 +++---
 70 files changed, 131 insertions(+), 131 deletions(-)

diff --git a/include/clang/AST/Decl.h b/include/clang/AST/Decl.h
index 88adbeb6e11..e00779844c1 100644
--- a/include/clang/AST/Decl.h
+++ b/include/clang/AST/Decl.h
@@ -3218,7 +3218,7 @@ public:
 ///
 /// An import declaration imports the named module (or submodule). For example:
 /// \code
-///   @__experimental_modules_import std.vector;
+///   @import std.vector;
 /// \endcode
 ///
 /// Import declarations can also be implicitly generated from
diff --git a/include/clang/Basic/IdentifierTable.h b/include/clang/Basic/IdentifierTable.h
index 9ad3f49bde0..34e2346820a 100644
--- a/include/clang/Basic/IdentifierTable.h
+++ b/include/clang/Basic/IdentifierTable.h
@@ -297,11 +297,11 @@ public:
   }
   
   /// \brief Determine whether this is the contextual keyword
-  /// '__experimental_modules_import'.
+  /// 'import'.
   bool isModulesImport() const { return IsModulesImport; }
   
   /// \brief Set whether this identifier is the contextual keyword 
-  /// '__experimental_modules_import'.
+  /// 'import'.
   void setModulesImport(bool I) {
     IsModulesImport = I;
     if (I)
diff --git a/include/clang/Basic/TokenKinds.def b/include/clang/Basic/TokenKinds.def
index 25e8d5a635c..f02ba6438bd 100644
--- a/include/clang/Basic/TokenKinds.def
+++ b/include/clang/Basic/TokenKinds.def
@@ -566,7 +566,7 @@ OBJC2_AT_KEYWORD(required)
 OBJC2_AT_KEYWORD(optional)
 OBJC2_AT_KEYWORD(synthesize)
 OBJC2_AT_KEYWORD(dynamic)
-OBJC2_AT_KEYWORD(__experimental_modules_import)
+OBJC2_AT_KEYWORD(import)
 
 // TODO: What to do about context-sensitive keywords like:
 //       bycopy/byref/in/inout/oneway/out?
diff --git a/lib/AST/DeclPrinter.cpp b/lib/AST/DeclPrinter.cpp
index 857a26621b8..5cef00f1874 100644
--- a/lib/AST/DeclPrinter.cpp
+++ b/lib/AST/DeclPrinter.cpp
@@ -686,7 +686,7 @@ void DeclPrinter::VisitFileScopeAsmDecl(FileScopeAsmDecl *D) {
 }
 
 void DeclPrinter::VisitImportDecl(ImportDecl *D) {
-  Out << "@__experimental_modules_import " << D->getImportedModule()->getFullModuleName()
+  Out << "@import " << D->getImportedModule()->getFullModuleName()
       << ";\n";
 }
 
diff --git a/lib/Basic/IdentifierTable.cpp b/lib/Basic/IdentifierTable.cpp
index 58c33bba8a3..49cd0ac615a 100644
--- a/lib/Basic/IdentifierTable.cpp
+++ b/lib/Basic/IdentifierTable.cpp
@@ -82,7 +82,7 @@ IdentifierTable::IdentifierTable(const LangOptions &LangOpts,
       
 
   // Add the '_experimental_modules_import' contextual keyword.
-  get("__experimental_modules_import").setModulesImport(true);
+  get("import").setModulesImport(true);
 }
 
 //===----------------------------------------------------------------------===//
diff --git a/lib/Lex/PPDirectives.cpp b/lib/Lex/PPDirectives.cpp
index 7b5df9c3148..5f95260ea80 100644
--- a/lib/Lex/PPDirectives.cpp
+++ b/lib/Lex/PPDirectives.cpp
@@ -1476,7 +1476,7 @@ void Preprocessor::HandleIncludeDirective(SourceLocation HashLoc,
       Diag(HashLoc, diag::warn_auto_module_import)
         << IncludeKind << PathString 
         << FixItHint::CreateReplacement(ReplaceRange,
-             "@__experimental_modules_import " + PathString.str().str() + ";");
+             "@import " + PathString.str().str() + ";");
     }
     
     // Load the module.
diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp
index 2341c01647d..4f0b189c8b0 100644
--- a/lib/Lex/Preprocessor.cpp
+++ b/lib/Lex/Preprocessor.cpp
@@ -631,10 +631,10 @@ void Preprocessor::HandleIdentifier(Token &Identifier) {
   if (II.isExtensionToken() && !DisableMacroExpansion)
     Diag(Identifier, diag::ext_token_used);
   
-  // If this is the '__experimental_modules_import' contextual keyword, note
+  // If this is the 'import' contextual keyword, note
   // that the next token indicates a module name.
   //
-  // Note that we do not treat '__experimental_modules_import' as a contextual
+  // Note that we do not treat 'import' as a contextual
   // keyword when we're in a caching lexer, because caching lexers only get
   // used in contexts where import declarations are disallowed.
   if (II.isModulesImport() && !InMacroArgs && !DisableMacroExpansion &&
diff --git a/lib/Parse/ParseObjc.cpp b/lib/Parse/ParseObjc.cpp
index 84d0b22d4d7..3b252d083e7 100644
--- a/lib/Parse/ParseObjc.cpp
+++ b/lib/Parse/ParseObjc.cpp
@@ -65,7 +65,7 @@ Parser::DeclGroupPtrTy Parser::ParseObjCAtDirectives() {
   case tok::objc_dynamic:
     SingleDecl = ParseObjCPropertyDynamic(AtLoc);
     break;
-  case tok::objc___experimental_modules_import:
+  case tok::objc_import:
     if (getLangOpts().Modules)
       return ParseModuleImport(AtLoc);
       
diff --git a/lib/Parse/Parser.cpp b/lib/Parse/Parser.cpp
index 8f4fa9f3ad9..f96ed99368c 100644
--- a/lib/Parse/Parser.cpp
+++ b/lib/Parse/Parser.cpp
@@ -1845,7 +1845,7 @@ void Parser::ParseMicrosoftIfExistsExternalDeclaration() {
 }
 
 Parser::DeclGroupPtrTy Parser::ParseModuleImport(SourceLocation AtLoc) {
-  assert(Tok.isObjCAtKeyword(tok::objc___experimental_modules_import) && 
+  assert(Tok.isObjCAtKeyword(tok::objc_import) && 
          "Improper start to module import");
   SourceLocation ImportLoc = ConsumeToken();
   
diff --git a/test/Index/annotate-module.m b/test/Index/annotate-module.m
index 3423f2b40d8..ba5b8257efc 100644
--- a/test/Index/annotate-module.m
+++ b/test/Index/annotate-module.m
@@ -1,6 +1,6 @@
 
 #include <DependsOnModule/DependsOnModule.h>
-@__experimental_modules_import DependsOnModule;
+@import DependsOnModule;
 int glob;
 
 // RUN: rm -rf %t.cache
@@ -17,9 +17,9 @@ int glob;
 // CHECK-NEXT: Identifier: "h" [2:43 - 2:44] inclusion directive=[[INC_DIR]]
 // CHECK-NEXT: Punctuation: ">" [2:44 - 2:45] inclusion directive=[[INC_DIR]]
 // CHECK-NEXT: Punctuation: "@" [3:1 - 3:2] ModuleImport=DependsOnModule:3:1
-// CHECK-NEXT: Keyword: "__experimental_modules_import" [3:2 - 3:31] ModuleImport=DependsOnModule:3:1
-// CHECK-NEXT: Identifier: "DependsOnModule" [3:32 - 3:47] ModuleImport=DependsOnModule:3:1
-// CHECK-NEXT: Punctuation: ";" [3:47 - 3:48]
+// CHECK-NEXT: Keyword: "import" [3:2 - 3:8] ModuleImport=DependsOnModule:3:1
+// CHECK-NEXT: Identifier: "DependsOnModule" [3:9 - 3:24] ModuleImport=DependsOnModule:3:1
+// CHECK-NEXT: Punctuation: ";" [3:24 - 3:25]
 // CHECK-NEXT: Keyword: "int" [4:1 - 4:4] VarDecl=glob:4:5
 // CHECK-NEXT: Identifier: "glob" [4:5 - 4:9] VarDecl=glob:4:5
 // CHECK-NEXT: Punctuation: ";" [4:9 - 4:10]
diff --git a/test/Index/complete-modules.m b/test/Index/complete-modules.m
index b82430db9db..a8737216e21 100644
--- a/test/Index/complete-modules.m
+++ b/test/Index/complete-modules.m
@@ -1,14 +1,14 @@
 // Note: the run lines follow their respective tests, since line/column
 // matter in this test.
 
-@__experimental_modules_import LibA.Extensions;
+@import LibA.Extensions;
 
 // RUN: rm -rf %t
-// RUN: c-index-test -code-completion-at=%s:4:32 -fmodule-cache-path %t -fmodules -F %S/Inputs/Frameworks -I %S/Inputs/Headers %s | FileCheck -check-prefix=CHECK-TOP-LEVEL %s
+// RUN: c-index-test -code-completion-at=%s:4:9 -fmodule-cache-path %t -fmodules -F %S/Inputs/Frameworks -I %S/Inputs/Headers %s | FileCheck -check-prefix=CHECK-TOP-LEVEL %s
 // CHECK-TOP-LEVEL: NotImplemented:{TypedText Framework} (50)
 // CHECK-TOP-LEVEL: NotImplemented:{TypedText LibA} (50)
 // CHECK-TOP-LEVEL: NotImplemented:{TypedText nested} (50)
 
-// RUN: c-index-test -code-completion-at=%s:4:37 -fmodule-cache-path %t -fmodules -F %S/Inputs/Frameworks -I %S/Inputs/Headers %s | FileCheck -check-prefix=CHECK-LIBA %s
+// RUN: c-index-test -code-completion-at=%s:4:14 -fmodule-cache-path %t -fmodules -F %S/Inputs/Frameworks -I %S/Inputs/Headers %s | FileCheck -check-prefix=CHECK-LIBA %s
 // CHECK-LIBA: NotImplemented:{TypedText Extensions} (50)
 
diff --git a/test/Index/crash-recovery-modules.m b/test/Index/crash-recovery-modules.m
index 212923f94be..8d93c1ae06d 100644
--- a/test/Index/crash-recovery-modules.m
+++ b/test/Index/crash-recovery-modules.m
@@ -4,7 +4,7 @@
 // Parse the file, such that building the module will cause Clang to crash.
 // RUN: not env CINDEXTEST_FAILONERROR=1 c-index-test -test-load-source all -fmodules -fmodule-cache-path %t -Xclang -fdisable-module-hash -I %S/Inputs/Headers -DCRASH %s 2> %t.err
 // RUN: FileCheck < %t.err -check-prefix=CHECK-CRASH %s
-// CHECK-CRASH: crash-recovery-modules.m:16:32:{16:2-16:37}: fatal error: could not build module 'Crash'
+// CHECK-CRASH: crash-recovery-modules.m:16:9:{16:2-16:14}: fatal error: could not build module 'Crash'
 
 // Parse the file again, without crashing, to make sure that
 // subsequent parses do the right thing.
@@ -13,7 +13,7 @@
 // REQUIRES: crash-recovery
 // REQUIRES: shell
 
-@__experimental_modules_import Crash;
+@import Crash;
 
 void test() {
   const char* error = getCrashString();
diff --git a/test/Index/index-module.m b/test/Index/index-module.m
index 0af4e37f3c3..54b77d1d5f0 100644
--- a/test/Index/index-module.m
+++ b/test/Index/index-module.m
@@ -1,6 +1,6 @@
 
 #include <DependsOnModule/DependsOnModule.h>
-@__experimental_modules_import DependsOnModule;
+@import DependsOnModule;
 int glob;
 
 // RUN: rm -rf %t.cache
diff --git a/test/Modules/Inputs/MutuallyRecursive1.framework/Headers/MutuallyRecursive1.h b/test/Modules/Inputs/MutuallyRecursive1.framework/Headers/MutuallyRecursive1.h
index 5142f56e601..156c22604f5 100644
--- a/test/Modules/Inputs/MutuallyRecursive1.framework/Headers/MutuallyRecursive1.h
+++ b/test/Modules/Inputs/MutuallyRecursive1.framework/Headers/MutuallyRecursive1.h
@@ -1,3 +1,3 @@
 
-@__experimental_modules_import MutuallyRecursive2;
+@import MutuallyRecursive2;
 
diff --git a/test/Modules/Inputs/MutuallyRecursive2.framework/Headers/MutuallyRecursive2.h b/test/Modules/Inputs/MutuallyRecursive2.framework/Headers/MutuallyRecursive2.h
index 8a3cc338c22..be3facd70ec 100644
--- a/test/Modules/Inputs/MutuallyRecursive2.framework/Headers/MutuallyRecursive2.h
+++ b/test/Modules/Inputs/MutuallyRecursive2.framework/Headers/MutuallyRecursive2.h
@@ -1,6 +1,6 @@
 
 
-@__experimental_modules_import MutuallyRecursive1;
+@import MutuallyRecursive1;
 
 
 
diff --git a/test/Modules/Inputs/category_bottom.h b/test/Modules/Inputs/category_bottom.h
index b53d9c30d6f..ab4c01c3149 100644
--- a/test/Modules/Inputs/category_bottom.h
+++ b/test/Modules/Inputs/category_bottom.h
@@ -1,10 +1,10 @@
-@__experimental_modules_import category_left;
+@import category_left;
 
 @interface Foo(Bottom)
 -(void)bottom;
 @end
 
-@__experimental_modules_import category_right;
+@import category_right;
 
 @interface LeftFoo(Bottom)
 -(void)bottom;
diff --git a/test/Modules/Inputs/category_left.h b/test/Modules/Inputs/category_left.h
index 736fa432690..05e2a1b96c5 100644
--- a/test/Modules/Inputs/category_left.h
+++ b/test/Modules/Inputs/category_left.h
@@ -1,4 +1,4 @@
-@__experimental_modules_import category_top;
+@import category_top;
 
 @interface Foo(Left)
 -(void)left;
diff --git a/test/Modules/Inputs/category_other.h b/test/Modules/Inputs/category_other.h
index 1bb5a91cbd7..2c3f4794c2a 100644
--- a/test/Modules/Inputs/category_other.h
+++ b/test/Modules/Inputs/category_other.h
@@ -1,4 +1,4 @@
-@__experimental_modules_import category_top;
+@import category_top;
 
 @interface Foo(Other)
 -(void)other;
diff --git a/test/Modules/Inputs/category_right.h b/test/Modules/Inputs/category_right.h
index 812a8407824..3c83624c761 100644
--- a/test/Modules/Inputs/category_right.h
+++ b/test/Modules/Inputs/category_right.h
@@ -1,4 +1,4 @@
-@__experimental_modules_import category_top;
+@import category_top;
 
 @interface Foo(Right1)
 -(void)right1;
diff --git a/test/Modules/Inputs/diamond.h b/test/Modules/Inputs/diamond.h
index 15b52900616..1990b45b5f8 100644
--- a/test/Modules/Inputs/diamond.h
+++ b/test/Modules/Inputs/diamond.h
@@ -1 +1 @@
-@__experimental_modules_import diamond_bottom;
+@import diamond_bottom;
diff --git a/test/Modules/Inputs/diamond_bottom.h b/test/Modules/Inputs/diamond_bottom.h
index b45fa936d1e..2a0a84e3d7b 100644
--- a/test/Modules/Inputs/diamond_bottom.h
+++ b/test/Modules/Inputs/diamond_bottom.h
@@ -1,4 +1,4 @@
-@__experimental_modules_import diamond_left;
-@__experimental_modules_import diamond_right;
+@import diamond_left;
+@import diamond_right;
 
 char bottom(char *x);
diff --git a/test/Modules/Inputs/diamond_left.h b/test/Modules/Inputs/diamond_left.h
index cc406ab3891..fce2e48882f 100644
--- a/test/Modules/Inputs/diamond_left.h
+++ b/test/Modules/Inputs/diamond_left.h
@@ -1,4 +1,4 @@
-@__experimental_modules_import diamond_top;
+@import diamond_top;
 
 float left(float *);
 
diff --git a/test/Modules/Inputs/diamond_right.h b/test/Modules/Inputs/diamond_right.h
index 2ba1d774413..fa408ea5ba7 100644
--- a/test/Modules/Inputs/diamond_right.h
+++ b/test/Modules/Inputs/diamond_right.h
@@ -1,4 +1,4 @@
-@__experimental_modules_import diamond_top;
+@import diamond_top;
 
 double right(double *);
 
diff --git a/test/Modules/Inputs/macros_left.h b/test/Modules/Inputs/macros_left.h
index cd056938918..a8aac75a2fd 100644
--- a/test/Modules/Inputs/macros_left.h
+++ b/test/Modules/Inputs/macros_left.h
@@ -1,4 +1,4 @@
-@__experimental_modules_import macros_top;
+@import macros_top;
 #define LEFT unsigned long
 
 #undef TOP_LEFT_UNDEF
diff --git a/test/Modules/Inputs/macros_right.h b/test/Modules/Inputs/macros_right.h
index e16a64b50ad..445f579cf6d 100644
--- a/test/Modules/Inputs/macros_right.h
+++ b/test/Modules/Inputs/macros_right.h
@@ -1,4 +1,4 @@
-@__experimental_modules_import macros_top;
+@import macros_top;
 #define RIGHT unsigned short
 
 
diff --git a/test/Modules/Inputs/namespaces-left.h b/test/Modules/Inputs/namespaces-left.h
index d253fed7c1b..7e9002aea8c 100644
--- a/test/Modules/Inputs/namespaces-left.h
+++ b/test/Modules/Inputs/namespaces-left.h
@@ -1,4 +1,4 @@
-@__experimental_modules_import namespaces_top;
+@import namespaces_top;
 
 namespace N1 { }
 
diff --git a/test/Modules/Inputs/namespaces-right.h b/test/Modules/Inputs/namespaces-right.h
index 7e7286e10b2..b18aeb44786 100644
--- a/test/Modules/Inputs/namespaces-right.h
+++ b/test/Modules/Inputs/namespaces-right.h
@@ -1,4 +1,4 @@
-@__experimental_modules_import namespaces_top;
+@import namespaces_top;
 
 namespace N2 { }
 
diff --git a/test/Modules/Inputs/redecl-merge-bottom.h b/test/Modules/Inputs/redecl-merge-bottom.h
index cfea7dc87da..28ea20c55de 100644
--- a/test/Modules/Inputs/redecl-merge-bottom.h
+++ b/test/Modules/Inputs/redecl-merge-bottom.h
@@ -1,11 +1,11 @@
-@__experimental_modules_import redecl_merge_left;
+@import redecl_merge_left;
 
 @class C4;
 @class C4;
 @protocol P4;
 @protocol P4;
 @protocol P4;
-@__experimental_modules_import redecl_merge_right;
+@import redecl_merge_right;
 
 @class B;
 
diff --git a/test/Modules/Inputs/redecl-merge-left-left.h b/test/Modules/Inputs/redecl-merge-left-left.h
index 5f48883bf15..79c4d620bee 100644
--- a/test/Modules/Inputs/redecl-merge-left-left.h
+++ b/test/Modules/Inputs/redecl-merge-left-left.h
@@ -1,4 +1,4 @@
-@__experimental_modules_import redecl_merge_left;
+@import redecl_merge_left;
 
 @class C4;
 void accept_a_C4(C4*);
diff --git a/test/Modules/Inputs/redecl-merge-left.h b/test/Modules/Inputs/redecl-merge-left.h
index 5e6d2e512b0..973d594a304 100644
--- a/test/Modules/Inputs/redecl-merge-left.h
+++ b/test/Modules/Inputs/redecl-merge-left.h
@@ -1,4 +1,4 @@
-@__experimental_modules_import redecl_merge_top;
+@import redecl_merge_top;
 
 @class A;
 
diff --git a/test/Modules/Inputs/redecl-merge-right.h b/test/Modules/Inputs/redecl-merge-right.h
index 20223083c31..b664ae9a720 100644
--- a/test/Modules/Inputs/redecl-merge-right.h
+++ b/test/Modules/Inputs/redecl-merge-right.h
@@ -1,4 +1,4 @@
-@__experimental_modules_import redecl_merge_top;
+@import redecl_merge_top;
 
 @interface Super
 @end
@@ -79,7 +79,7 @@ extern int var2;
 static double var3;
 
 int ONE;
-@__experimental_modules_import redecl_merge_top.Explicit;
+@import redecl_merge_top.Explicit;
 const int one = ONE;
 
 @interface ClassWithDef 
diff --git a/test/Modules/Inputs/templates-left.h b/test/Modules/Inputs/templates-left.h
index 57a8c85bf60..7451420c748 100644
--- a/test/Modules/Inputs/templates-left.h
+++ b/test/Modules/Inputs/templates-left.h
@@ -1,4 +1,4 @@
-@__experimental_modules_import templates_top;
+@import templates_top;
 
 template<typename T> class Vector;
 
diff --git a/test/Modules/Inputs/templates-right.h b/test/Modules/Inputs/templates-right.h
index 4ef4a32e8e2..d3524d34769 100644
--- a/test/Modules/Inputs/templates-right.h
+++ b/test/Modules/Inputs/templates-right.h
@@ -1,4 +1,4 @@
-@__experimental_modules_import templates_top;
+@import templates_top;
 
 template<typename T> class Vector { 
 public:
diff --git a/test/Modules/Inputs/wildcard-submodule-exports/C_one.h b/test/Modules/Inputs/wildcard-submodule-exports/C_one.h
index fb1c7de845b..e3b7593b80c 100644
--- a/test/Modules/Inputs/wildcard-submodule-exports/C_one.h
+++ b/test/Modules/Inputs/wildcard-submodule-exports/C_one.h
@@ -1,4 +1,4 @@
-@__experimental_modules_import A.One;
-@__experimental_modules_import B.One;
+@import A.One;
+@import B.One;
 
 long *C1;
diff --git a/test/Modules/Inputs/wildcard-submodule-exports/C_two.h b/test/Modules/Inputs/wildcard-submodule-exports/C_two.h
index 050a8f3e885..b65dcf612eb 100644
--- a/test/Modules/Inputs/wildcard-submodule-exports/C_two.h
+++ b/test/Modules/Inputs/wildcard-submodule-exports/C_two.h
@@ -1,4 +1,4 @@
-@__experimental_modules_import A.Two;
-@__experimental_modules_import B.Two;
+@import A.Two;
+@import B.Two;
 
 unsigned long *C2;
diff --git a/test/Modules/build-fail-notes.m b/test/Modules/build-fail-notes.m
index af817f9bca8..93809daca35 100644
--- a/test/Modules/build-fail-notes.m
+++ b/test/Modules/build-fail-notes.m
@@ -1,7 +1,7 @@
 // RUN: rm -rf %t
 // RUN: %clang_cc1 -fmodule-cache-path %t -fmodules -F %S/Inputs -DgetModuleVersion="epic fail" %s 2>&1 | FileCheck %s
 
-@__experimental_modules_import DependsOnModule;
+@import DependsOnModule;
 
 // CHECK: While building module 'DependsOnModule' imported from
 // CHECK: While building module 'Module' imported from
@@ -22,10 +22,10 @@ extern int Module;
 // RUN: c-index-test -read-diagnostics %t/tmp.diag 2>&1 | FileCheck -check-prefix=CHECK-SDIAG %s
 
 // CHECK-SDIAG: Module.h:9:13: error: expected ';' after top level declarator
-// CHECK-SDIAG: build-fail-notes.m:4:32: note: while building module 'DependsOnModule' imported from
+// CHECK-SDIAG: build-fail-notes.m:4:9: note: while building module 'DependsOnModule' imported from
 // CHECK-SDIAG: DependsOnModule.h:1:10: note: while building module 'Module' imported from
 // CHECK-SDIAG: note: expanded from here
 // CHECK-SDIAG: warning: umbrella header does not include header 'NotInModule.h' [-Wincomplete-umbrella]
 // CHECK-SDIAG: DependsOnModule.h:1:10: fatal: could not build module 'Module'
-// CHECK-SDIAG: build-fail-notes.m:4:32: note: while building module 'DependsOnModule' imported from
+// CHECK-SDIAG: build-fail-notes.m:4:9: note: while building module 'DependsOnModule' imported from
 
diff --git a/test/Modules/compiler_builtins.m b/test/Modules/compiler_builtins.m
index dfa46c8a34f..bd4309d4dad 100644
--- a/test/Modules/compiler_builtins.m
+++ b/test/Modules/compiler_builtins.m
@@ -4,9 +4,9 @@
 // expected-no-diagnostics
 
 #ifdef __SSE__
-@__experimental_modules_import _Builtin_intrinsics.intel.sse;
+@import _Builtin_intrinsics.intel.sse;
 #endif
 
 #ifdef __AVX2__
-@__experimental_modules_import _Builtin_intrinsics.intel.avx2;
+@import _Builtin_intrinsics.intel.avx2;
 #endif
diff --git a/test/Modules/cstd.m b/test/Modules/cstd.m
index e262c7e1442..928748570c4 100644
--- a/test/Modules/cstd.m
+++ b/test/Modules/cstd.m
@@ -2,24 +2,24 @@
 // RUN: %clang -fsyntax-only -isystem %S/Inputs/System/usr/include -fmodules -fmodule-cache-path %t -D__need_wint_t -Werror=implicit-function-declaration %s
 
 // Supplied by compiler, but referenced from the "/usr/include" module map.
-@__experimental_modules_import cstd.float_constants;
+@import cstd.float_constants;
 
 float getFltMax() { return FLT_MAX; }
 
 // Supplied by the "/usr/include" module map.
-@__experimental_modules_import cstd.stdio;
+@import cstd.stdio;
 
 void test_fprintf(FILE *file) {
   fprintf(file, "Hello, modules\n");
 }
 
 // Supplied by compiler, which forwards to the "/usr/include" version.
-@__experimental_modules_import cstd.stdint;
+@import cstd.stdint;
 
 my_awesome_nonstandard_integer_type value;
 
 // Supplied by the compiler; that version wins.
-@__experimental_modules_import cstd.stdbool;
+@import cstd.stdbool;
 
 #ifndef bool
 #  error "bool was not defined!"
diff --git a/test/Modules/cycles.c b/test/Modules/cycles.c
index 5fcb41ec1f6..ea893ee6dae 100644
--- a/test/Modules/cycles.c
+++ b/test/Modules/cycles.c
@@ -1,13 +1,13 @@
 // RUN: rm -rf %t
 // RUN: %clang_cc1 -fmodules -x objective-c -fmodule-cache-path %t -F %S/Inputs %s 2>&1 | FileCheck %s
 // FIXME: When we have a syntax for modules in C, use that.
-@__experimental_modules_import MutuallyRecursive1;
+@import MutuallyRecursive1;
 
 // CHECK: While building module 'MutuallyRecursive1' imported from
 // CHECK: While building module 'MutuallyRecursive2' imported from
-// CHECK: MutuallyRecursive2.h:3:32: fatal error: cyclic dependency in module 'MutuallyRecursive1': MutuallyRecursive1 -> MutuallyRecursive2 -> MutuallyRecursive1
+// CHECK: MutuallyRecursive2.h:3:9: fatal error: cyclic dependency in module 'MutuallyRecursive1': MutuallyRecursive1 -> MutuallyRecursive2 -> MutuallyRecursive1
 // CHECK: While building module 'MutuallyRecursive1' imported from
-// CHECK: MutuallyRecursive1.h:2:32: fatal error: could not build module 'MutuallyRecursive2'
-// CHECK: cycles.c:4:32: fatal error: could not build module 'MutuallyRecursive1'
+// CHECK: MutuallyRecursive1.h:2:9: fatal error: could not build module 'MutuallyRecursive2'
+// CHECK: cycles.c:4:9: fatal error: could not build module 'MutuallyRecursive1'
 // CHECK-NOT: error:
 
diff --git a/test/Modules/decldef.mm b/test/Modules/decldef.mm
index 64a66d59d0e..c99fdea0d84 100644
--- a/test/Modules/decldef.mm
+++ b/test/Modules/decldef.mm
@@ -10,10 +10,10 @@
 
 // in other file: expected-note{{previous definition is here}}
 
-@__experimental_modules_import decldef;
+@import decldef;
 A *a1; // expected-error{{unknown type name 'A'}}
 B *b1; // expected-error{{unknown type name 'B'}}
-@__experimental_modules_import decldef.Decl;
+@import decldef.Decl;
 
 A *a2;
 B *b;
diff --git a/test/Modules/diamond.c b/test/Modules/diamond.c
index 076eec4bf26..1d8902101ee 100644
--- a/test/Modules/diamond.c
+++ b/test/Modules/diamond.c
@@ -3,7 +3,7 @@
 
 // in diamond-bottom.h: expected-note{{passing argument to parameter 'x' here}}
 
-@__experimental_modules_import diamond_bottom;
+@import diamond_bottom;
 
 void test_diamond(int i, float f, double d, char c) {
   top(&i);
diff --git a/test/Modules/epic-fail.m b/test/Modules/epic-fail.m
index 7c3faaf63fe..ef0aa5a0e72 100644
--- a/test/Modules/epic-fail.m
+++ b/test/Modules/epic-fail.m
@@ -1,8 +1,8 @@
 // RUN: rm -rf %t
 // RUN: %clang_cc1 -fmodule-cache-path %t -fmodules -F %S/Inputs -DgetModuleVersion="epic fail" %s 2>&1 | FileCheck %s
 
-@__experimental_modules_import Module;
-@__experimental_modules_import DependsOnModule;
+@import Module;
+@import DependsOnModule;
 
 // CHECK: While building module 'Module' imported from
 // CHECK: error: expected ';' after top level declarator
diff --git a/test/Modules/header-import.m b/test/Modules/header-import.m
index 49549d0c671..60d2889dc9f 100644
--- a/test/Modules/header-import.m
+++ b/test/Modules/header-import.m
@@ -3,6 +3,6 @@
 // expected-no-diagnostics
 
 #import "point.h"
-@__experimental_modules_import Module;
+@import Module;
 #import "point.h"
 
diff --git a/test/Modules/import-decl.cpp b/test/Modules/import-decl.cpp
index 0f05f92708b..781e19fde80 100644
--- a/test/Modules/import-decl.cpp
+++ b/test/Modules/import-decl.cpp
@@ -2,7 +2,7 @@
 // RUN: %clang -fmodule-cache-path %t -fmodules -x objective-c -I %S/Inputs -emit-ast -o %t.ast %s
 // RUN: %clang_cc1 -ast-print -x ast - < %t.ast | FileCheck %s
 
-@__experimental_modules_import import_decl;
+@import import_decl;
 // CHECK: struct T
 
 int main() {
diff --git a/test/Modules/inferred-frameworks.m b/test/Modules/inferred-frameworks.m
index 916c900b645..56854d80c82 100644
--- a/test/Modules/inferred-frameworks.m
+++ b/test/Modules/inferred-frameworks.m
@@ -3,6 +3,6 @@
 
 #include <NotAModule/NotAModule.h>
 
-@__experimental_modules_import NotAModule; // expected-error{{module 'NotAModule' not found}}
+@import NotAModule; // expected-error{{module 'NotAModule' not found}}
 
 
diff --git a/test/Modules/inferred-submodules.m b/test/Modules/inferred-submodules.m
index 8c61bc081c2..9c8b81536ee 100644
--- a/test/Modules/inferred-submodules.m
+++ b/test/Modules/inferred-submodules.m
@@ -2,13 +2,13 @@
 // RUN: %clang_cc1 -x objective-c -Wauto-import -fmodule-cache-path %t -fmodules -F %S/Inputs %s -verify
 // expected-no-diagnostics
 
-@__experimental_modules_import Module.Sub;
+@import Module.Sub;
 
 void test_Module_Sub() {
   int *ip = Module_Sub;
 }
 
-@__experimental_modules_import Module.Buried.Treasure;
+@import Module.Buried.Treasure;
 
 void dig() {
   unsigned *up = Buried_Treasure;
diff --git a/test/Modules/irgen.c b/test/Modules/irgen.c
index 4a080db5b2e..8f4c299a7ef 100644
--- a/test/Modules/irgen.c
+++ b/test/Modules/irgen.c
@@ -3,7 +3,7 @@
 // RUN: %clang_cc1 -fmodules -x objective-c -fmodule-cache-path %t -triple x86_64-apple-darwin10 -emit-llvm -o - %s | FileCheck %s
 // FIXME: When we have a syntax for modules in C, use that.
 
-@__experimental_modules_import irgen;
+@import irgen;
 
 // CHECK: define void @triple_value
 void triple_value(int *px) {
diff --git a/test/Modules/load_failure.c b/test/Modules/load_failure.c
index 3a963012b19..bc0b4263159 100644
--- a/test/Modules/load_failure.c
+++ b/test/Modules/load_failure.c
@@ -1,15 +1,15 @@
 #ifdef NONEXISTENT
-@__experimental_modules_import load_nonexistent;
+@import load_nonexistent;
 #endif
 
 #ifdef FAILURE
-@__experimental_modules_import load_failure;
+@import load_failure;
 #endif
 
 // RUN: rm -rf %t
 // RUN: %clang_cc1 -fmodules -x objective-c++ -fmodule-cache-path %t -fdisable-module-hash -emit-module -fmodule-name=load_failure %S/Inputs/module.map
 // RUN: %clang_cc1 -fmodules -x objective-c -fmodule-cache-path %t -fdisable-module-hash %s -DNONEXISTENT 2>&1 | FileCheck -check-prefix=CHECK-NONEXISTENT %s
-// CHECK-NONEXISTENT: load_failure.c:2:32: fatal error: module 'load_nonexistent' not found
+// CHECK-NONEXISTENT: load_failure.c:2:9: fatal error: module 'load_nonexistent' not found
 
 // RUN: not %clang_cc1 -fmodules -x objective-c -fmodule-cache-path %t -fdisable-module-hash %s -DFAILURE 2> %t.out
 // RUN: FileCheck -check-prefix=CHECK-FAILURE %s < %t.out
diff --git a/test/Modules/lookup.cpp b/test/Modules/lookup.cpp
index 70d210750d9..76e1f6aae2e 100644
--- a/test/Modules/lookup.cpp
+++ b/test/Modules/lookup.cpp
@@ -1,8 +1,8 @@
 
-#define import @__experimental_modules_import
+#define import @import
 import lookup_left_cxx;
 #undef import
-#define IMPORT(X) @__experimental_modules_import X
+#define IMPORT(X) @import X
 IMPORT(lookup_right_cxx);
 
 // in lookup_left.hpp: expected-warning@3 {{weak identifier 'weak_identifier' never declared}}
diff --git a/test/Modules/lookup.m b/test/Modules/lookup.m
index c82503f7903..7ca0c23a465 100644
--- a/test/Modules/lookup.m
+++ b/test/Modules/lookup.m
@@ -1,8 +1,8 @@
 
 // lookup_left.h: expected-note{{using}}
 // lookup_right.h: expected-note{{also found}}
-@__experimental_modules_import lookup_left_objc;
-@__experimental_modules_import lookup_right_objc;
+@import lookup_left_objc;
+@import lookup_right_objc;
 
 void test(id x) {
   [x method]; // expected-warning{{multiple methods named 'method' found}}
diff --git a/test/Modules/macros.c b/test/Modules/macros.c
index 8db3915f24a..f6b47442c4c 100644
--- a/test/Modules/macros.c
+++ b/test/Modules/macros.c
@@ -16,7 +16,7 @@
 
 // expected-note{{other definition of 'TOP_RIGHT_REDEF'}}
 
-@__experimental_modules_import macros;
+@import macros;
 
 #ifndef INTEGER
 #  error INTEGER macro should be visible
@@ -65,7 +65,7 @@ void f() {
 #endif
 
 // Import left module (which also imports top)
-@__experimental_modules_import macros_left;
+@import macros_left;
 
 #ifndef LEFT
 #  error LEFT should be visible
@@ -91,7 +91,7 @@ void test1() {
 #define LEFT_RIGHT_DIFFERENT2 double // FIXME: expected-warning{{'LEFT_RIGHT_DIFFERENT2' macro redefined}}
 
 // Import right module (which also imports top)
-@__experimental_modules_import macros_right;
+@import macros_right;
 
 #undef LEFT_RIGHT_DIFFERENT3
 
@@ -130,7 +130,7 @@ void test3() {
 #  error TOP_RIGHT_UNDEF should still be defined
 #endif
 
-@__experimental_modules_import macros_right.undef;
+@import macros_right.undef;
 
 #ifdef TOP_RIGHT_UNDEF
 # error TOP_RIGHT_UNDEF should not be defined
diff --git a/test/Modules/method_pool.m b/test/Modules/method_pool.m
index 25582caec3a..9574caa1528 100644
--- a/test/Modules/method_pool.m
+++ b/test/Modules/method_pool.m
@@ -1,7 +1,7 @@
 // RUN: rm -rf %t
 // RUN: %clang_cc1 -fmodule-cache-path %t -fmodules -I %S/Inputs %s -verify
 
-@__experimental_modules_import MethodPoolA;
+@import MethodPoolA;
 
 
 // in other file: // expected-note{{using}}
@@ -19,7 +19,7 @@ void testMethod2(id object) {
   [object method2:1];
 } 
 
-@__experimental_modules_import MethodPoolB;
+@import MethodPoolB;
 
 void testMethod1Again(id object) {
   [object method1];
diff --git a/test/Modules/modify-module.m b/test/Modules/modify-module.m
index b630ac10587..422d3c3e97c 100644
--- a/test/Modules/modify-module.m
+++ b/test/Modules/modify-module.m
@@ -13,7 +13,7 @@
 // RUN: echo 'int getA(); int getA2();' > %t/include/A.h
 // RUN: %clang_cc1 -fmodule-cache-path %t/cache -fmodules -I %t/include %s -verify
 
-@__experimental_modules_import B;
+@import B;
 
 int getValue() { return getA() + getB(); }
 
diff --git a/test/Modules/module-private.cpp b/test/Modules/module-private.cpp
index 31a3410a03f..b2905a1f764 100644
--- a/test/Modules/module-private.cpp
+++ b/test/Modules/module-private.cpp
@@ -4,8 +4,8 @@
 // RUN: %clang_cc1 -fmodules -x objective-c++ -fmodule-cache-path %t %s -verify
 // FIXME: When we have a syntax for modules in C++, use that.
 
-@__experimental_modules_import module_private_left;
-@__experimental_modules_import module_private_right;
+@import module_private_left;
+@import module_private_right;
 
 void test() {
   int &ir = f0(1.0); // okay: f0() from 'right' is not visible
diff --git a/test/Modules/namespaces.cpp b/test/Modules/namespaces.cpp
index 19e0c5a991f..871ae793d31 100644
--- a/test/Modules/namespaces.cpp
+++ b/test/Modules/namespaces.cpp
@@ -11,8 +11,8 @@ namespace N6 {
 
 namespace N8 { }
 
-@__experimental_modules_import namespaces_left;
-@__experimental_modules_import namespaces_right;
+@import namespaces_left;
+@import namespaces_right;
 
 void test() {
   int &ir1 = N1::f(1);
diff --git a/test/Modules/normal-module-map.cpp b/test/Modules/normal-module-map.cpp
index 07ca5ed9330..6509a6d023d 100644
--- a/test/Modules/normal-module-map.cpp
+++ b/test/Modules/normal-module-map.cpp
@@ -8,7 +8,7 @@ int getUmbrella() {
   return umbrella + umbrella_sub; 
 }
 
-@__experimental_modules_import Umbrella2;
+@import Umbrella2;
 
 #include "a1.h"
 #include "b1.h"
@@ -18,7 +18,7 @@ int test() {
   return a1 + b1 + nested2;
 }
 
-@__experimental_modules_import nested_umbrella.a;
+@import nested_umbrella.a;
 
 int testNestedUmbrellaA() {
   return nested_umbrella_a;
@@ -28,17 +28,17 @@ int testNestedUmbrellaBFail() {
   return nested_umbrella_b; // expected-error{{use of undeclared identifier 'nested_umbrella_b'; did you mean 'nested_umbrella_a'?}}
 }
 
-@__experimental_modules_import nested_umbrella.b;
+@import nested_umbrella.b;
 
 int testNestedUmbrellaB() {
   return nested_umbrella_b;
 }
 
-@__experimental_modules_import nested_umbrella.a_extras;
+@import nested_umbrella.a_extras;
 
-@__experimental_modules_import nested_umbrella._1;
+@import nested_umbrella._1;
 
-@__experimental_modules_import nested_umbrella.decltype_;
+@import nested_umbrella.decltype_;
 
 int testSanitizedName() {
   return extra_a + one + decltype_val;
diff --git a/test/Modules/objc-categories.m b/test/Modules/objc-categories.m
index b26759239dd..f19dc7efcf0 100644
--- a/test/Modules/objc-categories.m
+++ b/test/Modules/objc-categories.m
@@ -6,7 +6,7 @@
 // RUN: %clang_cc1 -fmodules -fmodule-cache-path %t -x objective-c -fmodule-name=category_other -emit-module %S/Inputs/module.map
 // RUN: %clang_cc1 -fmodules -fmodule-cache-path %t %s -verify
 
-@__experimental_modules_import category_bottom;
+@import category_bottom;
 
 
 
@@ -34,7 +34,7 @@ void test(Foo *foo, LeftFoo *leftFoo) {
 
 // Load another module that also adds categories to Foo, verify that
 // we see those categories.
-@__experimental_modules_import category_other;
+@import category_other;
 
 void test_other(Foo *foo) {
   [foo other];
diff --git a/test/Modules/on-demand-build-warnings.m b/test/Modules/on-demand-build-warnings.m
index 24975c01b78..7116f01d381 100644
--- a/test/Modules/on-demand-build-warnings.m
+++ b/test/Modules/on-demand-build-warnings.m
@@ -1,5 +1,5 @@
 // RUN: rm -rf %t
 // RUN: %clang_cc1 -fmodules -fno-objc-infer-related-result-type -Wmodule-build -fmodule-cache-path %t -F %S/Inputs -verify %s
 
-@__experimental_modules_import Module; // expected-warning{{building module 'Module' from source}}
+@import Module; // expected-warning{{building module 'Module' from source}}
 
diff --git a/test/Modules/on-demand-build.m b/test/Modules/on-demand-build.m
index 4ee6b58d96b..32bdc37206b 100644
--- a/test/Modules/on-demand-build.m
+++ b/test/Modules/on-demand-build.m
@@ -3,7 +3,7 @@
 // RUN: %clang_cc1 -fmodules -fno-objc-infer-related-result-type -Werror -Wno-error=incomplete-umbrella -x objective-c++ -fmodule-cache-path %t -F %S/Inputs -I %S/Inputs -verify %s
 // RUN: %clang_cc1 -fmodules -fno-objc-infer-related-result-type -Werror -Wno-error=incomplete-umbrella -fmodule-cache-path %t -F %S/Inputs -I %S/Inputs -verify %s
 #define FOO
-@__experimental_modules_import Module;
+@import Module;
 @interface OtherClass
 @end
 
@@ -19,6 +19,6 @@ void test_getModuleVersion() {
 #  error MODULE_SUBFRAMEWORK_H should be hidden
 #endif
 
-@__experimental_modules_import subdir;
+@import subdir;
 
 const char *getSubdirTest() { return getSubdir(); }
diff --git a/test/Modules/on-demand-macros.m b/test/Modules/on-demand-macros.m
index 8b50529f1a2..208bb567eda 100644
--- a/test/Modules/on-demand-macros.m
+++ b/test/Modules/on-demand-macros.m
@@ -3,7 +3,7 @@
 // RUN: %clang_cc1 -fmodules -fmodule-cache-path %t -F %S/Inputs -verify %s
 // expected-no-diagnostics
 
-@__experimental_modules_import CmdLine;
+@import CmdLine;
 
 void test() {
 #ifdef FOO_RETURNS_INT_PTR
diff --git a/test/Modules/redecl-merge.m b/test/Modules/redecl-merge.m
index d7224149a28..52c4511bdc5 100644
--- a/test/Modules/redecl-merge.m
+++ b/test/Modules/redecl-merge.m
@@ -3,12 +3,12 @@
 @class C2;
 @class C3;
 @class C3;
-@__experimental_modules_import redecl_merge_left;
+@import redecl_merge_left;
 typedef struct my_struct_type *my_struct_ref;
 @protocol P4;
 @class C3;
 @class C3;
-@__experimental_modules_import redecl_merge_right;
+@import redecl_merge_right;
 
 @implementation A
 - (Super*)init { return self; }
@@ -112,7 +112,7 @@ C4 *global_C4;
 
 ClassWithDef *cwd1;
 
-@__experimental_modules_import redecl_merge_left_left;
+@import redecl_merge_left_left;
 
 void test_C4a(C4 *c4) {
   global_C4 = c4 = get_a_C4();
@@ -123,7 +123,7 @@ void test_ClassWithDef(ClassWithDef *cwd) {
   [cwd method];
 }
 
-@__experimental_modules_import redecl_merge_bottom;
+@import redecl_merge_bottom;
 
 void test_C4b() {
   if (&refers_to_C4) {
diff --git a/test/Modules/redecl-namespaces.mm b/test/Modules/redecl-namespaces.mm
index e3388215648..97887573830 100644
--- a/test/Modules/redecl-namespaces.mm
+++ b/test/Modules/redecl-namespaces.mm
@@ -1,5 +1,5 @@
-@__experimental_modules_import redecl_namespaces_left;
-@__experimental_modules_import redecl_namespaces_right;
+@import redecl_namespaces_left;
+@import redecl_namespaces_right;
 
 void test() {
   A::i;
diff --git a/test/Modules/redeclarations.m b/test/Modules/redeclarations.m
index 221e154cb27..b4b01347c6e 100644
--- a/test/Modules/redeclarations.m
+++ b/test/Modules/redeclarations.m
@@ -1,5 +1,5 @@
-@__experimental_modules_import redeclarations_left;
-@__experimental_modules_import redeclarations_right;
+@import redeclarations_left;
+@import redeclarations_right;
 
 @interface MyObject : NSObject
 @end
diff --git a/test/Modules/requires.m b/test/Modules/requires.m
index ce2537c78b7..70d6160b0f3 100644
--- a/test/Modules/requires.m
+++ b/test/Modules/requires.m
@@ -1,5 +1,5 @@
 // RUN: rm -rf %t
 // RUN: %clang_cc1 -Wauto-import -fmodule-cache-path %t -fmodules -F %S/Inputs %s -verify
 
-@__experimental_modules_import DependsOnModule.CXX; // expected-error{{module 'DependsOnModule.CXX' requires feature 'cplusplus'}}
+@import DependsOnModule.CXX; // expected-error{{module 'DependsOnModule.CXX' requires feature 'cplusplus'}}
 
diff --git a/test/Modules/subframeworks.m b/test/Modules/subframeworks.m
index 09298c49395..e87bc6bac33 100644
--- a/test/Modules/subframeworks.m
+++ b/test/Modules/subframeworks.m
@@ -2,13 +2,13 @@
 // RUN: %clang_cc1 -Wauto-import -fmodule-cache-path %t -fmodules -F %S/Inputs -F %S/Inputs/DependsOnModule.framework/Frameworks %s -verify
 // RUN: %clang_cc1 -x objective-c++ -Wauto-import -fmodule-cache-path %t -fmodules -F %S/Inputs -F %S/Inputs/DependsOnModule.framework/Frameworks %s -verify
 
-@__experimental_modules_import DependsOnModule;
+@import DependsOnModule;
 
 void testSubFramework() {
   float *sf1 = sub_framework; // expected-error{{use of undeclared identifier 'sub_framework'}}
 }
 
-@__experimental_modules_import DependsOnModule.SubFramework;
+@import DependsOnModule.SubFramework;
 
 void testSubFrameworkAgain() {
   float *sf2 = sub_framework;
@@ -16,7 +16,7 @@ void testSubFrameworkAgain() {
 }
 
 #ifdef __cplusplus
-@__experimental_modules_import DependsOnModule.CXX;
+@import DependsOnModule.CXX;
 
 CXXOnly cxxonly;
 #endif
diff --git a/test/Modules/submodules-preprocess.cpp b/test/Modules/submodules-preprocess.cpp
index 8d6c2cd70d8..7d218b13593 100644
--- a/test/Modules/submodules-preprocess.cpp
+++ b/test/Modules/submodules-preprocess.cpp
@@ -2,7 +2,7 @@
 // RUN: %clang_cc1 -fmodules -x objective-c++ -Eonly -fmodule-cache-path %t -I %S/Inputs/submodules %s -verify
 // FIXME: When we have a syntax for modules in C++, use that.
 
-@__experimental_modules_import std.vector;
+@import std.vector;
 
 #ifndef HAVE_VECTOR
 #  error HAVE_VECTOR macro is not available (but should be)
@@ -16,7 +16,7 @@
 #  error HAVE_HASH_MAP macro is available (but shouldn't be)
 #endif
 
-@__experimental_modules_import std.typetraits; // expected-error{{no submodule named 'typetraits' in module 'std'; did you mean 'type_traits'?}}
+@import std.typetraits; // expected-error{{no submodule named 'typetraits' in module 'std'; did you mean 'type_traits'?}}
 
 #ifndef HAVE_VECTOR
 #  error HAVE_VECTOR macro is not available (but should be)
@@ -30,9 +30,9 @@
 #  error HAVE_HASH_MAP macro is available (but shouldn't be)
 #endif
 
-@__experimental_modules_import std.vector.compare; // expected-error{{no submodule named 'compare' in module 'std.vector'}}
+@import std.vector.compare; // expected-error{{no submodule named 'compare' in module 'std.vector'}}
 
-@__experimental_modules_import std; // import everything in 'std'
+@import std; // import everything in 'std'
 
 #ifndef HAVE_VECTOR
 #  error HAVE_VECTOR macro is not available (but should be)
@@ -46,7 +46,7 @@
 #  error HAVE_HASH_MAP macro is available (but shouldn't be)
 #endif
 
-@__experimental_modules_import std.hash_map;
+@import std.hash_map;
 
 #ifndef HAVE_VECTOR
 #  error HAVE_VECTOR macro is not available (but should be)
diff --git a/test/Modules/submodules.cpp b/test/Modules/submodules.cpp
index 60d5ae0c22f..1417446416c 100644
--- a/test/Modules/submodules.cpp
+++ b/test/Modules/submodules.cpp
@@ -2,7 +2,7 @@
 // RUN: %clang_cc1 -x objective-c++ -fmodule-cache-path %t -fmodules -I %S/Inputs/submodules %s -verify
 // FIXME: When we have a syntax for modules in C++, use that.
 
-@__experimental_modules_import std.vector;
+@import std.vector;
 
 vector<int> vi;
 
@@ -10,20 +10,20 @@ vector<int> vi;
 remove_reference<int&>::type *int_ptr = 0; // expected-error{{unknown type name 'remove_reference'}} \
 // expected-error{{expected unqualified-id}}
 
-@__experimental_modules_import std.typetraits; // expected-error{{no submodule named 'typetraits' in module 'std'; did you mean 'type_traits'?}}
+@import std.typetraits; // expected-error{{no submodule named 'typetraits' in module 'std'; did you mean 'type_traits'?}}
 
 vector<float> vf;
 remove_reference<int&>::type *int_ptr2 = 0;
 
-@__experimental_modules_import std.vector.compare; // expected-error{{no submodule named 'compare' in module 'std.vector'}}
+@import std.vector.compare; // expected-error{{no submodule named 'compare' in module 'std.vector'}}
 
-@__experimental_modules_import std; // import everything in 'std'
+@import std; // import everything in 'std'
 
 // hash_map still isn't available.
 hash_map<int, float> ints_to_floats; // expected-error{{unknown type name 'hash_map'}} \
 // expected-error{{expected unqualified-id}}
 
-@__experimental_modules_import std.hash_map;
+@import std.hash_map;
 
 hash_map<int, float> ints_to_floats2;
 
diff --git a/test/Modules/submodules.m b/test/Modules/submodules.m
index a758abc248d..bf2d52947e9 100644
--- a/test/Modules/submodules.m
+++ b/test/Modules/submodules.m
@@ -4,7 +4,7 @@
 // expected-no-diagnostics
 
 // Note: transitively imports Module.Sub2.
-@__experimental_modules_import Module.Sub;
+@import Module.Sub;
 
 int getValue() { 
   return *Module_Sub + *Module_Sub2;
diff --git a/test/Modules/templates.mm b/test/Modules/templates.mm
index 45417401d86..22f94caea61 100644
--- a/test/Modules/templates.mm
+++ b/test/Modules/templates.mm
@@ -3,8 +3,8 @@
 // RUN: %clang_cc1 -x objective-c++ -fmodules -fmodule-cache-path %t -I %S/Inputs -emit-llvm %s -o - -Wno-objc-root-class | grep Emit | FileCheck %s
 // expected-no-diagnostics
 
-@__experimental_modules_import templates_left;
-@__experimental_modules_import templates_right;
+@import templates_left;
+@import templates_right;
 
 
 void testTemplateClasses() {
diff --git a/test/Modules/wildcard-submodule-exports.cpp b/test/Modules/wildcard-submodule-exports.cpp
index 6b4f02c6f23..00d95716512 100644
--- a/test/Modules/wildcard-submodule-exports.cpp
+++ b/test/Modules/wildcard-submodule-exports.cpp
@@ -2,7 +2,7 @@
 // RUN: %clang_cc1 -x objective-c++ -fmodule-cache-path %t -fmodules -I %S/Inputs/wildcard-submodule-exports %s -verify
 // FIXME: When we have a syntax for modules in C++, use that.
 
-@__experimental_modules_import C.One;
+@import C.One;
 
 void test_C_One() {
   int *A1_ptr = A1;
@@ -10,7 +10,7 @@ void test_C_One() {
   (void)B1; // expected-error{{use of undeclared identifier 'B1'}}
 }
 
-@__experimental_modules_import C.Two;
+@import C.Two;
 
 void test_C_Two() {
   unsigned int *A2_ptr = A2;
@@ -18,7 +18,7 @@ void test_C_Two() {
   unsigned long *C2_ptr = C2;
 }
 
-@__experimental_modules_import B.One;
+@import B.One;
 
 void test_B_One() {
   short *B1_ptr = B1;
-- 
GitLab