diff options
Diffstat (limited to 'test')
61 files changed, 120 insertions, 120 deletions
diff --git a/test/Index/annotate-module.m b/test/Index/annotate-module.m index 3423f2b40d..ba5b8257ef 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 b82430db9d..a8737216e2 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 212923f94b..8d93c1ae06 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 0af4e37f3c..54b77d1d5f 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 5142f56e60..156c22604f 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 8a3cc338c2..be3facd70e 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 b53d9c30d6..ab4c01c314 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 736fa43269..05e2a1b96c 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 1bb5a91cbd..2c3f4794c2 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 812a840782..3c83624c76 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 15b5290061..1990b45b5f 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 b45fa936d1..2a0a84e3d7 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 cc406ab389..fce2e48882 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 2ba1d77441..fa408ea5ba 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 cd05693891..a8aac75a2f 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 e16a64b50a..445f579cf6 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 d253fed7c1..7e9002aea8 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 7e7286e10b..b18aeb4478 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 cfea7dc87d..28ea20c55d 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 5f48883bf1..79c4d620be 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 5e6d2e512b..973d594a30 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 20223083c3..b664ae9a72 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 57a8c85bf6..7451420c74 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 4ef4a32e8e..d3524d3476 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 fb1c7de845..e3b7593b80 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 050a8f3e88..b65dcf612e 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 af817f9bca..93809daca3 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 dfa46c8a34..bd4309d4da 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 e262c7e144..928748570c 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 5fcb41ec1f..ea893ee6da 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/t |