diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-02-20 23:28:05 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-02-20 23:28:05 +0000 |
| commit | 5b8b3db5c941dc03c1fa307a04f93729889a656b (patch) | |
| tree | d302e07a3ed8d871c46e4f4ae8e77ff0d9add776 /clang/lib/Sema/SemaTemplate.cpp | |
| parent | 47eeddde241774e9a2602c854eb7154a8dc3eb3d (diff) | |
| download | bcm5719-llvm-5b8b3db5c941dc03c1fa307a04f93729889a656b.tar.gz bcm5719-llvm-5b8b3db5c941dc03c1fa307a04f93729889a656b.zip | |
Fix a constexpr FIXME: When implicitly instantiating the primary template for an
explicit specialization of a function template, mark the instantiation as
constexpr if the specialization is, rather than requiring them to match.
llvm-svn: 151001
Diffstat (limited to 'clang/lib/Sema/SemaTemplate.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaTemplate.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaTemplate.cpp b/clang/lib/Sema/SemaTemplate.cpp index 17bdd69ec24..2c98d0ab97b 100644 --- a/clang/lib/Sema/SemaTemplate.cpp +++ b/clang/lib/Sema/SemaTemplate.cpp @@ -5677,8 +5677,13 @@ Sema::CheckFunctionTemplateSpecialization(FunctionDecl *FD, // Note: do not overwrite location info if previous template // specialization kind was explicit. TemplateSpecializationKind TSK = SpecInfo->getTemplateSpecializationKind(); - if (TSK == TSK_Undeclared || TSK == TSK_ImplicitInstantiation) + if (TSK == TSK_Undeclared || TSK == TSK_ImplicitInstantiation) { Specialization->setLocation(FD->getLocation()); + // C++11 [dcl.constexpr]p1: An explicit specialization of a constexpr + // function can differ from the template declaration with respect to + // the constexpr specifier. + Specialization->setConstexpr(FD->isConstexpr()); + } // FIXME: Check if the prior specialization has a point of instantiation. // If so, we have run afoul of . |
