Eliminate the uglified keyword __import_module__ for importing
modules. This leaves us without an explicit syntax for importing
modules in C/C++, because such a syntax needs to be discussed
first. In Objective-C/Objective-C++, the @import syntax is used to
import modules.

Note that, under -fmodules, C/C++ programs can import modules via the
#include mechanism when a module map is in place for that header. This
allows us to work with modules in C/C++ without committing to a syntax.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@147467 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/Modules/normal-module-map.cpp b/test/Modules/normal-module-map.cpp
index 4d2f59a..2858dab 100644
--- a/test/Modules/normal-module-map.cpp
+++ b/test/Modules/normal-module-map.cpp
@@ -8,7 +8,7 @@
   return umbrella + umbrella_sub; 
 }
 
-__import_module__ Umbrella2;
+@import Umbrella2;
 
 #include "a1.h"
 #include "b1.h"
@@ -18,7 +18,7 @@
   return a1 + b1 + nested2;
 }
 
-__import_module__ nested_umbrella.a;
+@import nested_umbrella.a;
 
 int testNestedUmbrellaA() {
   return nested_umbrella_a;
@@ -28,7 +28,7 @@
   return nested_umbrella_b; // expected-error{{use of undeclared identifier 'nested_umbrella_b'; did you mean 'nested_umbrella_a'?}}
 }
 
-__import_module__ nested_umbrella.b;
+@import nested_umbrella.b;
 
 int testNestedUmbrellaB() {
   return nested_umbrella_b;