Remove VarDecl from CXXConstructExpr.

llvm-svn: 72633

4 files changed, 6 insertions, 15 deletions

diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index 67c6dc3fae4..f13179f0438 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -1800,7 +1800,7 @@ void Sema::InitializeVarWithConstructor(VarDecl *VD,
                                         CXXConstructorDecl *Constructor,
                                         QualType DeclInitType, 
                                         Expr **Exprs, unsigned NumExprs) {
-  Expr *Temp = CXXConstructExpr::Create(Context, VD, DeclInitType, Constructor, 
+  Expr *Temp = CXXConstructExpr::Create(Context, DeclInitType, Constructor, 
                                         false, Exprs, NumExprs);
   VD->setInit(Context, Temp);
 }
diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp
index b6ccb99d6ba..e9b68d7a5e0 100644
--- a/clang/lib/Sema/SemaExprCXX.cpp
+++ b/clang/lib/Sema/SemaExprCXX.cpp
@@ -208,7 +208,7 @@ Sema::ActOnCXXTypeConstructExpr(SourceRange TypeRange, TypeTy *TypeRep,
       
       exprs.release();
       
-      Expr *E = new (Context) CXXTemporaryObjectExpr(Context, Temp, Constructor, 
+      Expr *E = new (Context) CXXTemporaryObjectExpr(Context, Constructor, 
                                                      Ty, TyBeginLoc, Exprs,
                                                      NumExprs, RParenLoc);
       return MaybeBindToTemporary(E);
@@ -883,9 +883,8 @@ Sema::PerformImplicitConversion(Expr *&From, QualType ToType,
     // FIXME: When can ToType be a reference type?
     assert(!ToType->isReferenceType());
     
-    CXXTempVarDecl *Temp = CXXTempVarDecl::Create(Context, CurContext, ToType);
     // FIXME: Keep track of whether the copy constructor is elidable or not.
-    From = CXXConstructExpr::Create(Context, Temp, ToType, 
+    From = CXXConstructExpr::Create(Context, ToType, 
                                     SCS.CopyConstructor, false, &From, 1);
     return false;
   }
diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp
index 20c712fa293..4976bd466fc 100644
--- a/clang/lib/Sema/SemaInit.cpp
+++ b/clang/lib/Sema/SemaInit.cpp
@@ -174,8 +174,8 @@ bool Sema::CheckInitializerTypes(Expr *&Init, QualType &DeclType,
         if (!Constructor)
           return true;
         
-        Init = CXXConstructExpr::Create(Context, 0, DeclType, Constructor, 
-                                        false, &Init, 1);
+        Init = CXXConstructExpr::Create(Context, DeclType, Constructor, false, 
+                                        &Init, 1);
         return false;
       }
       
diff --git a/clang/lib/Sema/SemaTemplateInstantiateExpr.cpp b/clang/lib/Sema/SemaTemplateInstantiateExpr.cpp
index c37bf2b2c43..a6b9703cee0 100644
--- a/clang/lib/Sema/SemaTemplateInstantiateExpr.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiateExpr.cpp
@@ -1007,15 +1007,7 @@ TemplateExprInstantiator::VisitCXXConstructExpr(CXXConstructExpr *E) {
     Args.push_back(ArgInst.takeAs<Expr>());
   }
 
-
-  VarDecl *Var = cast_or_null<VarDecl>(SemaRef.InstantiateDecl(E->getVarDecl(),
-                                                            SemaRef.CurContext,
-                                                               TemplateArgs));
-  if (!Var)
-    return SemaRef.ExprError();
-
-  SemaRef.CurrentInstantiationScope->InstantiatedLocal(E->getVarDecl(), Var);
-  return SemaRef.Owned(CXXConstructExpr::Create(SemaRef.Context, Var, T,
+  return SemaRef.Owned(CXXConstructExpr::Create(SemaRef.Context, T,
                                                 E->getConstructor(), 
                                                 E->isElidable(),
                                                 Args.takeAs<Expr>(),