An instantiation of a constexpr static data member in a class template is

constexpr.

llvm-svn: 148505
This commit is contained in:
Richard Smith 2012-01-19 22:46:17 +00:00
parent 6f99b63718
commit 45bb45523f
2 changed files with 15 additions and 0 deletions

View File

@ -330,6 +330,7 @@ Decl *TemplateDeclInstantiator::VisitVarDecl(VarDecl *D) {
Var->setThreadSpecified(D->isThreadSpecified());
Var->setCXXDirectInitializer(D->hasCXXDirectInitializer());
Var->setCXXForRangeDecl(D->isCXXForRangeDecl());
Var->setConstexpr(D->isConstexpr());
// Substitute the nested name specifier, if any.
if (SubstQualifier(D, Var))

View File

@ -24,3 +24,17 @@ constexpr int S::b = 0;
const int S::c;
constexpr int S::d = 0;
constexpr int S::d2;
template<typename T>
struct U {
static constexpr int a = 0;
static constexpr int b; // expected-error {{declaration of constexpr static data member 'b' requires an initializer}}
// FIXME: It'd be nice to error on this at template definition time.
static constexpr NonLit h = NonLit(); // expected-error 2{{must be initialized by a constant expression}} expected-note 2{{non-literal type}}
static constexpr T c = T(); // expected-error {{must be initialized by a constant expression}} expected-note {{non-literal type}}
};
U<int> u1; // expected-note {{here}}
U<NonLit> u2; // expected-note {{here}}
static_assert(U<int>::a == 0, "");