A dependent initializer with zero arguments should return a NULL

initializer (for no initialization) rather than a ParenListExpr with
zero arguments in it.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@95382 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 28f49d07986f77950826657e1c55a5253dd45d3c..1415f73f644c4ffb8c425115eb583df87494af41 100644 (file)
--- 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 1f1e76c9999b57f019af56b6944d03def01fd5e9..45cd930ba0aaab7bfe25ca6dc335cee1d7712d64 100644 (file)
--- 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 69c7721b5186b34120f8cec0d000f751ea1b48cd..6b76d72e3261a32ba4032ed36fea45feae13eeb0 100644 (file)
--- 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>();