diff options
author | Eric Liu <ioeric@google.com> | 2017-10-10 13:09:40 +0000 |
---|---|---|
committer | Eric Liu <ioeric@google.com> | 2017-10-10 13:09:40 +0000 |
commit | e8f1fa7770f1d9c8a25344b3c342aef7bb8c0bca (patch) | |
tree | a4ca0cc33605603dd3c587cb671b4ee75defb9a4 /test/CXX | |
parent | 5c21b0272a1bf5bfa17457368afcbd097ea1314e (diff) |
Revert "[Modules TS] Module ownership semantics for redeclarations."
This reverts commit r315251. See the original commit thread for reason.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@315309 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/CXX')
3 files changed, 0 insertions, 118 deletions
diff --git a/test/CXX/modules-ts/basic/basic.def.odr/p6/global-vs-module.cpp b/test/CXX/modules-ts/basic/basic.def.odr/p6/global-vs-module.cpp deleted file mode 100644 index cceca5106c..0000000000 --- a/test/CXX/modules-ts/basic/basic.def.odr/p6/global-vs-module.cpp +++ /dev/null @@ -1,55 +0,0 @@ -// RUN: %clang_cc1 -fmodules-ts -verify -std=c++17 %s -// RUN: %clang_cc1 -fmodules-ts -verify -std=c++17 %s -DEXPORT -// RUN: %clang_cc1 -fmodules-ts -verify -std=c++17 %s -DUSING - -#ifndef NO_GLOBAL -extern int var; // expected-note {{previous declaration is here}} -int func(); // expected-note {{previous declaration is here}} -struct str; // expected-note {{previous declaration is here}} -using type = int; - -template<typename> extern int var_tpl; // expected-note {{previous declaration is here}} -template<typename> int func_tpl(); // expected-note-re {{{{previous declaration is here|target of using declaration}}}} -template<typename> struct str_tpl; // expected-note {{previous declaration is here}} -template<typename> using type_tpl = int; // expected-note {{previous declaration is here}} - -typedef int type; -namespace ns { using ::func; } -namespace ns_alias = ns; -#endif - -export module M; - -#ifdef USING -using ::var; -using ::func; -using ::str; -using ::type; -using ::var_tpl; -using ::func_tpl; // expected-note {{using declaration}} -using ::str_tpl; -using ::type_tpl; -#endif - -#ifdef EXPORT -export { -#endif - -extern int var; // expected-error {{declaration of 'var' in module M follows declaration in the global module}} -int func(); // expected-error {{declaration of 'func' in module M follows declaration in the global module}} -struct str; // expected-error {{declaration of 'str' in module M follows declaration in the global module}} -using type = int; - -template<typename> extern int var_tpl; // expected-error {{declaration of 'var_tpl' in module M follows declaration in the global module}} -// FIXME: Is this the right diagnostic in the -DUSING case? -template<typename> int func_tpl(); // expected-error-re {{{{declaration of 'func_tpl' in module M follows declaration in the global module|conflicts with target of using declaration}}}} -template<typename> struct str_tpl; // expected-error {{declaration of 'str_tpl' in module M follows declaration in the global module}} -template<typename> using type_tpl = int; // expected-error {{declaration of 'type_tpl' in module M follows declaration in the global module}} - -typedef int type; -namespace ns { using ::func; } -namespace ns_alias = ns; - -#ifdef EXPORT -} -#endif diff --git a/test/CXX/modules-ts/basic/basic.def.odr/p6/module-vs-global.cpp b/test/CXX/modules-ts/basic/basic.def.odr/p6/module-vs-global.cpp deleted file mode 100644 index f58506dd9c..0000000000 --- a/test/CXX/modules-ts/basic/basic.def.odr/p6/module-vs-global.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// RUN: rm -rf %t -// RUN: %clang_cc1 -fmodules-ts -emit-module-interface -std=c++17 %S/global-vs-module.cpp -o %t -DNO_GLOBAL -DEXPORT -// RUN: %clang_cc1 -fmodules-ts -verify -std=c++17 %s -fmodule-file=%t - -import M; - -extern int var; // expected-error {{declaration of 'var' in the global module follows declaration in module M}} expected-note@global-vs-module.cpp:38 {{previous}} -int func(); // expected-error {{declaration of 'func' in the global module follows declaration in module M}} expected-note@global-vs-module.cpp:39 {{previous}} -struct str; // expected-error {{declaration of 'str' in the global module follows declaration in module M}} expected-note@global-vs-module.cpp:40 {{previous}} -using type = int; - -template<typename> extern int var_tpl; // expected-error {{declaration of 'var_tpl' in the global module follows declaration in module M}} expected-note@global-vs-module.cpp:43 {{previous}} -template<typename> int func_tpl(); // expected-error {{declaration of 'func_tpl' in the global module follows declaration in module M}} expected-note@global-vs-module.cpp:45 {{previous}} -template<typename> struct str_tpl; // expected-error {{declaration of 'str_tpl' in the global module follows declaration in module M}} expected-note@global-vs-module.cpp:46 {{previous}} -template<typename> using type_tpl = int; // expected-error {{declaration of 'type_tpl' in the global module follows declaration in module M}} expected-note@global-vs-module.cpp:47 {{previous}} - -typedef int type; -namespace ns { using ::func; } -namespace ns_alias = ns; diff --git a/test/CXX/modules-ts/basic/basic.def.odr/p6/module-vs-module.cpp b/test/CXX/modules-ts/basic/basic.def.odr/p6/module-vs-module.cpp deleted file mode 100644 index 39e210c4ad..0000000000 --- a/test/CXX/modules-ts/basic/basic.def.odr/p6/module-vs-module.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// RUN: rm -rf %t -// RUN: mkdir %t -// -// Some of the following tests intentionally have no -verify in their RUN -// lines; we are testing that those cases do not produce errors. -// -// RUN: %clang_cc1 -fmodules-ts -std=c++17 %S/global-vs-module.cpp -emit-module-interface -o %t/M.pcm -DNO_GLOBAL -DEXPORT -// RUN: %clang_cc1 -fmodules-ts -std=c++17 %s -fmodule-file=%t/M.pcm -DMODULE_INTERFACE -verify -// RUN: %clang_cc1 -fmodules-ts -std=c++17 %s -fmodule-file=%t/M.pcm -DMODULE_INTERFACE -DNO_IMPORT -// -// RUN: %clang_cc1 -fmodules-ts -std=c++17 %s -fmodule-file=%t/M.pcm -emit-module-interface -o %t/N.pcm -DMODULE_INTERFACE -DNO_ERRORS -// RUN: %clang_cc1 -fmodules-ts -std=c++17 %s -fmodule-file=%t/N.pcm -verify -// FIXME: Once we start importing "import" declarations properly, this should -// be rejected (-verify should be added to the following line). -// RUN: %clang_cc1 -fmodules-ts -std=c++17 %s -fmodule-file=%t/N.pcm -DNO_IMPORT -// -// RUN: %clang_cc1 -fmodules-ts -std=c++17 %s -fmodule-file=%t/M.pcm -emit-module-interface -o %t/N-no-M.pcm -DMODULE_INTERFACE -DNO_ERRORS -DNO_IMPORT -// RUN: %clang_cc1 -fmodules-ts -std=c++17 %s -fmodule-file=%t/N-no-M.pcm -verify -// RUN: %clang_cc1 -fmodules-ts -std=c++17 %s -fmodule-file=%t/N-no-M.pcm -DNO_IMPORT - -#ifdef MODULE_INTERFACE -export -#endif -module N; - -#ifndef NO_IMPORT -import M; -#endif - -#ifndef NO_ERRORS -extern int var; // expected-error {{declaration of 'var' in module N follows declaration in module M}} expected-note@global-vs-module.cpp:38 {{previous}} -int func(); // expected-error {{declaration of 'func' in module N follows declaration in module M}} expected-note@global-vs-module.cpp:39 {{previous}} -struct str; // expected-error {{declaration of 'str' in module N follows declaration in module M}} expected-note@global-vs-module.cpp:40 {{previous}} -using type = int; - -template<typename> extern int var_tpl; // expected-error {{declaration of 'var_tpl' in module N follows declaration in module M}} expected-note@global-vs-module.cpp:43 {{previous}} -template<typename> int func_tpl(); // expected-error {{declaration of 'func_tpl' in module N follows declaration in module M}} expected-note@global-vs-module.cpp:45 {{previous}} -template<typename> struct str_tpl; // expected-error {{declaration of 'str_tpl' in module N follows declaration in module M}} expected-note@global-vs-module.cpp:46 {{previous}} -template<typename> using type_tpl = int; // expected-error {{declaration of 'type_tpl' in module N follows declaration in module M}} expected-note@global-vs-module.cpp:47 {{previous}} - -typedef int type; -namespace ns { using ::func; } -namespace ns_alias = ns; -#endif |