diff options
author | Ilya Biryukov <ibiryukov@google.com> | 2019-04-24 08:50:24 +0000 |
---|---|---|
committer | Ilya Biryukov <ibiryukov@google.com> | 2019-04-24 08:50:24 +0000 |
commit | 59fef7181c504e1cd540b29109b26474f098c46f (patch) | |
tree | 6c95cbc14bf6fd42cd691138f8cc50879d9d1a8b /test/CXX | |
parent | cb27266d3b1a362acd736ee802ebed8a166e2175 (diff) |
Revert r359048: C++ DR2387: a variable template declared wthi
The change breaks libc++ with the follwing error:
In file included from valarray:4:
.../include/c++/v1/valarray:1062:60: error: explicit instantiation declaration of 'valarray<_Tp>' with internal linkage
_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS valarray<size_t>::valarray(size_t))
^
.../include/c++/v1/valarray:1063:60: error: explicit instantiation declaration of '~valarray<_Tp>' with internal linkage
_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS valarray<size_t>::~valarray())
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@359076 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/CXX')
-rw-r--r-- | test/CXX/drs/dr0xx.cpp | 7 | ||||
-rw-r--r-- | test/CXX/drs/dr17xx.cpp | 2 | ||||
-rw-r--r-- | test/CXX/drs/dr23xx.cpp | 26 | ||||
-rw-r--r-- | test/CXX/module/module.interface/p3.cpp | 2 | ||||
-rw-r--r-- | test/CXX/module/module.interface/p5.cpp | 6 |
5 files changed, 9 insertions, 34 deletions
diff --git a/test/CXX/drs/dr0xx.cpp b/test/CXX/drs/dr0xx.cpp index 53bd6f3f05..911aab1747 100644 --- a/test/CXX/drs/dr0xx.cpp +++ b/test/CXX/drs/dr0xx.cpp @@ -869,17 +869,18 @@ namespace dr68 { // dr68: yes } namespace dr69 { // dr69: yes - template<typename T> static void f() {} // #dr69-f + template<typename T> static void f() {} // FIXME: Should we warn here? inline void g() { f<int>(); } - extern template void f<char>(); // expected-error {{explicit instantiation declaration of 'f' with internal linkage}} + // FIXME: This should be rejected, per [temp.explicit]p11. + extern template void f<char>(); #if __cplusplus < 201103L // expected-error@-2 {{C++11 extension}} #endif template<void(*)()> struct Q {}; Q<&f<int> > q; #if __cplusplus < 201103L - // expected-error@-2 {{internal linkage}} expected-note@#dr69-f {{here}} + // expected-error@-2 {{internal linkage}} expected-note@-11 {{here}} #endif } diff --git a/test/CXX/drs/dr17xx.cpp b/test/CXX/drs/dr17xx.cpp index bf7458ea81..9f67b24271 100644 --- a/test/CXX/drs/dr17xx.cpp +++ b/test/CXX/drs/dr17xx.cpp @@ -77,7 +77,7 @@ namespace dr1758 { // dr1758: 3.7 #endif } -namespace dr1722 { // dr1722: 9 +namespace dr1722 { // dr1722: 9.0 #if __cplusplus >= 201103L void f() { const auto lambda = [](int x) { return x + 1; }; diff --git a/test/CXX/drs/dr23xx.cpp b/test/CXX/drs/dr23xx.cpp deleted file mode 100644 index 87db0d4c9b..0000000000 --- a/test/CXX/drs/dr23xx.cpp +++ /dev/null @@ -1,26 +0,0 @@ -// RUN: %clang_cc1 -std=c++98 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -// RUN: %clang_cc1 -std=c++11 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -// RUN: %clang_cc1 -std=c++14 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -// RUN: %clang_cc1 -std=c++17 %s -verify -fexceptions -fcxx-exceptions -pedantic-errors -// RUN: %clang_cc1 -std=c++2a %s -verify -fexceptions -fcxx-exceptions -pedantic-errors - -#if __cplusplus <= 201103L -// expected-no-diagnostics -#endif - -namespace dr2387 { // dr2387: 9 -#if __cplusplus >= 201402L - template<int> int a = 0; - extern template int a<0>; // ok - - template<int> static int b = 0; - extern template int b<0>; // expected-error {{internal linkage}} - - template<int> const int c = 0; - extern template const int c<0>; // ok, has external linkage despite 'const' - - template<typename T> T d = 0; - extern template int d<int>; - extern template const int d<const int>; -#endif -} diff --git a/test/CXX/module/module.interface/p3.cpp b/test/CXX/module/module.interface/p3.cpp index 29d2cb43b4..2bf1f334e1 100644 --- a/test/CXX/module/module.interface/p3.cpp +++ b/test/CXX/module/module.interface/p3.cpp @@ -48,7 +48,7 @@ export namespace { int c; } // expected-error {{declaration of 'c' with internal namespace { // expected-note {{here}} export int d; // expected-error {{export declaration appears within anonymous namespace}} } -export template<typename> static int e; // expected-error {{declaration of 'e' with internal linkage cannot be exported}} +export template<typename> static int e; // FIXME export template<typename> static int f(); // expected-error {{declaration of 'f' with internal linkage cannot be exported}} export const int k = 5; export static union { int n; }; // expected-error {{declaration of 'n' with internal linkage cannot be exported}} diff --git a/test/CXX/module/module.interface/p5.cpp b/test/CXX/module/module.interface/p5.cpp index 17c4105baa..c4299dc04f 100644 --- a/test/CXX/module/module.interface/p5.cpp +++ b/test/CXX/module/module.interface/p5.cpp @@ -14,7 +14,7 @@ static union { int sg1, sg2; }; // expected-note {{target}} namespace NS {} template<typename> int ta; -template<typename> static int sta; // expected-note {{target}} +template<typename> static int sta; template<typename> void tb(); template<typename> static void stb(); // expected-note {{target}} template<typename> struct tc {}; @@ -44,7 +44,7 @@ namespace UnnamedNS { } } -export { // expected-note 19{{here}} +export { // expected-note 18{{here}} using ::a; using ::sa; // expected-error {{using declaration referring to 'sa' with internal linkage}} using ::b; @@ -56,7 +56,7 @@ export { // expected-note 19{{here}} using ::sg1; // expected-error {{using declaration referring to 'sg1' with internal linkage}} using ::ta; - using ::sta; // expected-error {{using declaration referring to 'sta' with internal linkage}} + using ::sta; // FIXME {{using declaration referring to 'sta' with internal linkage}} using ::tb; using ::stb; // expected-error {{using declaration referring to 'stb' with internal linkage}} using ::tc; |