diff options
| -rw-r--r-- | clang/lib/Sema/SemaTemplateInstantiateDecl.cpp | 4 | ||||
| -rw-r--r-- | clang/test/CodeGenCXX/instantiate-init-list.cpp | 13 |
2 files changed, 16 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp index 641ea244278..33d262311c8 100644 --- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp +++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp @@ -188,11 +188,13 @@ Decl *TemplateDeclInstantiator::VisitVarDecl(VarDecl *D) { Var->setInvalidDecl(); else if (!D->getType()->isDependentType() && !D->getInit()->isTypeDependent() && - !D->getInit()->isValueDependent()) { + !D->getInit()->isValueDependent() && + !isa<InitListExpr>(D->getInit())) { // If neither the declaration's type nor its initializer are dependent, // we don't want to redo all the checking, especially since the // initializer might have been wrapped by a CXXConstructExpr since we did // it the first time. + // FIXME: The InitListExpr handling here is a hack! Var->setInit(SemaRef.Context, Init.takeAs<Expr>()); } else if (ParenListExpr *PLE = dyn_cast<ParenListExpr>((Expr *)Init.get())) { diff --git a/clang/test/CodeGenCXX/instantiate-init-list.cpp b/clang/test/CodeGenCXX/instantiate-init-list.cpp new file mode 100644 index 00000000000..7d5458af1f5 --- /dev/null +++ b/clang/test/CodeGenCXX/instantiate-init-list.cpp @@ -0,0 +1,13 @@ +// RUN: clang-cc %s -emit-llvm-only -verify + +struct F { + void (*x)(); +}; +void G(); +template<class T> class A { + A(); +}; +template<class T> A<T>::A() { + static F f = { G }; +} +A<int> a; |
