diff options
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 3 | ||||
| -rw-r--r-- | lib/Sema/SemaInit.cpp | 3 | ||||
| -rw-r--r-- | test/SemaTemplate/instantiate-decl-init.cpp | 10 |
3 files changed, 15 insertions, 1 deletions
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 28f49d0798..1415f73f64 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -3727,7 +3727,8 @@ void Sema::ActOnUninitializedDecl(DeclPtrTy dcl, if (Init.isInvalid()) Var->setInvalidDecl(); else { - Var->setInit(Context, + if (Init.get()) + Var->setInit(Context, MaybeCreateCXXExprWithTemporaries(Init.takeAs<Expr>())); FinalizeVarWithDestructor(Var, InitType->getAs<RecordType>()); } diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp index 1f1e76c999..45cd930ba0 100644 --- a/lib/Sema/SemaInit.cpp +++ b/lib/Sema/SemaInit.cpp @@ -3190,6 +3190,9 @@ InitializationSequence::Perform(Sema &S, if (Kind.getKind() == InitializationKind::IK_Copy || Kind.isExplicitCast()) return Sema::OwningExprResult(S, Args.release()[0]); + if (Args.size() == 0) + return S.Owned((Expr *)0); + unsigned NumArgs = Args.size(); return S.Owned(new (S.Context) ParenListExpr(S.Context, SourceLocation(), diff --git a/test/SemaTemplate/instantiate-decl-init.cpp b/test/SemaTemplate/instantiate-decl-init.cpp index 69c7721b51..6b76d72e32 100644 --- a/test/SemaTemplate/instantiate-decl-init.cpp +++ b/test/SemaTemplate/instantiate-decl-init.cpp @@ -34,3 +34,13 @@ void f0() { template void f0<int>(); template void f0<float>(); + +struct NonTrivial { + NonTrivial(); + ~NonTrivial(); +}; + +template<int N> void f1() { + NonTrivial array[N]; +} +template<> void f1<2>(); |