When we create an implicit CXXTemporaryObjectExpr we don't need to check that it's a valid init. Instead, just set it as the VarDecl's initializer.

llvm-svn: 69292

1 files changed, 1 insertions, 6 deletions

diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index 5e781f974d6..3cfa8aed32d 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -1827,10 +1827,6 @@ void Sema::AddCXXDirectInitializerToDecl(DeclPtrTy Dcl,
     if (!Constructor)
       RealDecl->setInvalidDecl();
     else {
-#if 0
-      // FIXME: Adding the initializer causes an error in 
-      // test/SemaCXX/default2.cpp so it's disabled for now.
-      
       // Let clients know that initialization was done with a direct
       // initializer.
       VDecl->setCXXDirectInitializer(true);
@@ -1841,8 +1837,7 @@ void Sema::AddCXXDirectInitializerToDecl(DeclPtrTy Dcl,
                                              (Expr**)Exprs.release(), 
                                              NumExprs,
                                              SourceLocation());
-      AddInitializerToDecl(Dcl, ExprArg(*this, Temp), /*DirectInit=*/true);
-#endif
+      VDecl->setInit(Temp);
     }
     return;
   }