diff options
author | Richard Smith <richard-llvm@metafoo.co.uk> | 2017-02-09 22:47:51 +0000 |
---|---|---|
committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2017-02-09 22:47:51 +0000 |
commit | 32f0979f8f43e8655ac3173ae9d93a411111d873 (patch) | |
tree | 49c694a58c6eaec32aa41b5c8b1a08ce2eac9117 | |
parent | 7bf80c8d8f328456a72c31e07837096023b6659b (diff) |
Disallow explicit instantiation and explicit specialization for deduction guides.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@294641 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | include/clang/Basic/DiagnosticSemaKinds.td | 2 | ||||
-rw-r--r-- | lib/Sema/SemaDecl.cpp | 10 | ||||
-rw-r--r-- | lib/Sema/SemaTemplate.cpp | 8 | ||||
-rw-r--r-- | test/CXX/temp/temp.deduct.guide/p1.cpp | 20 | ||||
-rw-r--r-- | www/cxx_status.html | 8 |
5 files changed, 45 insertions, 3 deletions
diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index 8a36e704c0..a27c055a48 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.td +++ b/include/clang/Basic/DiagnosticSemaKinds.td @@ -1991,6 +1991,8 @@ def err_deduction_guide_name_not_class_template : Error< "template template parameter|dependent template name}0 %1">; def err_deduction_guide_defines_function : Error< "deduction guide cannot have a function definition">; +def err_deduction_guide_specialized : Error<"deduction guide cannot be " + "%select{explicitly instantiated|explicitly specialized}0">; // C++1y deduced return types def err_auto_fn_deduction_failure : Error< diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index aa6200c179..7749bef4e7 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -7657,8 +7657,9 @@ static FunctionDecl* CreateNewFunctionDecl(Sema &SemaRef, Declarator &D, } else if (Name.getNameKind() == DeclarationName::CXXDeductionGuideName) { SemaRef.CheckDeductionGuideDeclarator(D, R, SC); - // We don't need to store any extra information for a deduction guide, so + // We don't need to store much extra information for a deduction guide, so // just model it as a plain FunctionDecl. + // FIXME: Store IsExplicit! return FunctionDecl::Create(SemaRef.Context, DC, D.getLocStart(), NameInfo, R, TInfo, SC, isInline, @@ -9149,6 +9150,13 @@ bool Sema::CheckFunctionDeclaration(Scope *S, FunctionDecl *NewFD, } else if (CXXConversionDecl *Conversion = dyn_cast<CXXConversionDecl>(NewFD)) { ActOnConversionDeclarator(Conversion); + } else if (NewFD->isDeductionGuide() && + NewFD->getTemplateSpecializationKind() == + TSK_ExplicitSpecialization) { + // A deduction guide is not on the list of entities that can be + // explicitly specialized. + Diag(NewFD->getLocStart(), diag::err_deduction_guide_specialized) + << /*explicit specialization*/ 1; } // Find any virtual functions that this function overrides. diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp index 6b11d184c9..d0ed17cc49 100644 --- a/lib/Sema/SemaTemplate.cpp +++ b/lib/Sema/SemaTemplate.cpp @@ -8187,6 +8187,14 @@ DeclResult Sema::ActOnExplicitInstantiation(Scope *S, return true; } + // A deduction guide is not on the list of entities that can be explicitly + // instantiated. + if (Name.getNameKind() == DeclarationName::CXXDeductionGuideName) { + Diag(D.getDeclSpec().getLocStart(), diag::err_deduction_guide_specialized) + << /*explicit instantiation*/ 0; + return true; + } + // C++0x [temp.explicit]p2: // There are two forms of explicit instantiation: an explicit instantiation // definition and an explicit instantiation declaration. An explicit diff --git a/test/CXX/temp/temp.deduct.guide/p1.cpp b/test/CXX/temp/temp.deduct.guide/p1.cpp index 8dd0720669..c0a2ba1129 100644 --- a/test/CXX/temp/temp.deduct.guide/p1.cpp +++ b/test/CXX/temp/temp.deduct.guide/p1.cpp @@ -86,3 +86,23 @@ A(int(&)[43]) -> A<int> try {} catch (...) {} // expected-error {{deduction guid #ifdef CLASS }; #endif + +namespace ExplicitInst { + // Explicit instantiation / specialization is not permitted. + template<typename T> struct B {}; + template<typename T> B(T) -> B<T>; + template<> B(int) -> B<int>; // expected-error {{deduction guide cannot be explicitly specialized}} + extern template B(float) -> B<float>; // expected-error {{deduction guide cannot be explicitly instantiated}} + template B(char) -> B<char>; // expected-error {{deduction guide cannot be explicitly instantiated}} + + // An attempt at partial specialization doesn't even parse as a deduction-guide. + template<typename T> B<T*>(T*) -> B<T*>; // expected-error 1+{{}} expected-note 0+{{}} + + struct X { + template<typename T> struct C {}; + template<typename T> C(T) -> C<T>; + template<> C(int) -> C<int>; // expected-error {{explicit specialization of '<deduction guide for C>' in class scope}} + extern template C(float) -> C<float>; // expected-error {{expected member name or ';'}} + template C(char) -> C<char>; // expected-error {{expected '<' after 'template'}} + }; +} diff --git a/www/cxx_status.html b/www/cxx_status.html index eb0beeb185..6adf7fda8a 100644 --- a/www/cxx_status.html +++ b/www/cxx_status.html @@ -682,10 +682,14 @@ as the draft C++1z standard evolves. <td class="svn" align="center">Clang 4</td> </tr> <tr> - <td>Template argument deduction for class templates</td> + <td rowspan="2">Template argument deduction for class templates</td> <td><a href="http://wg21.link/p0091r3">P0091R3</a></td> - <td class="none" align="center">No</td> + <td class="partial" align="center">Partial</td> </tr> + <tr> <!-- from Issaquah --> + <td><a href="http://wg21.link/p0512r0">P0512R0</a></td> + <td class="partial" align="center">Partial</td> + </tr> <tr> <td>Non-type template parameters with <tt>auto</tt> type</td> <td><a href="http://wg21.link/p0127r2">P0127R2</a></td> |