A dependent initializer with zero arguments should return a NULL

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

llvm-svn: 95382

2 files changed, 5 insertions, 1 deletions

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 28f49d07986..1415f73f644 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/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/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp
index 1f1e76c9999..45cd930ba0a 100644
--- a/clang/lib/Sema/SemaInit.cpp
+++ b/clang/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(),