Merge the ASTVector and ASTOwningVector templates, since they offered

redundant functionality. The result (ASTOwningVector) lives in
clang/Parse/Ownership.h and is used by both the parser and semantic
analysis. No intended functionality change.

llvm-svn: 72214

2 files changed, 6 insertions, 18 deletions

diff --git a/clang/lib/Sema/SemaTemplateInstantiateExpr.cpp b/clang/lib/Sema/SemaTemplateInstantiateExpr.cpp
index 43666df7c0f..340cabd085c 100644
--- a/clang/lib/Sema/SemaTemplateInstantiateExpr.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiateExpr.cpp
@@ -282,8 +282,7 @@ Sema::OwningExprResult TemplateExprInstantiator::VisitCallExpr(CallExpr *E) {
     = ((Expr *)Callee.get())->getSourceRange().getBegin();
   return SemaRef.ActOnCallExpr(/*Scope=*/0, move(Callee), 
                                /*FIXME:*/FakeLParenLoc,
-                               Sema::MultiExprArg(SemaRef,
-                                                  Args.take(), Args.size()),
+                               move_arg(Args),
                                /*FIXME:*/&FakeCommaLocs.front(), 
                                E->getRParenLoc());
 }
@@ -671,9 +670,7 @@ TemplateExprInstantiator::VisitCXXTemporaryObjectExpr(
                                                        /*, FIXME*/),
                                            T.getAsOpaquePtr(),
                                            /*FIXME*/E->getTypeBeginLoc(),
-                                           Sema::MultiExprArg(SemaRef,
-                                                              Args.take(),
-                                                              Args.size()),
+                                           move_arg(Args),
                                            /*HACK*/&CommaLoc,
                                            E->getSourceRange().getEnd());
 }
@@ -924,9 +921,7 @@ TemplateExprInstantiator::VisitCXXNewExpr(CXXNewExpr *E) {
   return SemaRef.BuildCXXNew(E->getSourceRange().getBegin(), 
                              E->isGlobalNew(),
                              /*FIXME*/SourceLocation(),
-                             Sema::MultiExprArg(SemaRef,
-                                                PlacementArgs.take(),
-                                                PlacementArgs.size()),
+                             move_arg(PlacementArgs),
                              /*FIXME*/SourceLocation(),
                              E->isParenTypeId(),
                              AllocType,
@@ -979,9 +974,7 @@ TemplateExprInstantiator::VisitCXXUnresolvedConstructExpr(
                                                        E->getLParenLoc()),
                                            T.getAsOpaquePtr(),
                                            E->getLParenLoc(),
-                                           Sema::MultiExprArg(SemaRef, 
-                                                              Args.take(),
-                                                              Args.size()),
+                                           move_arg(Args),
                                            &FakeCommaLocs.front(),
                                            E->getRParenLoc());
 }
diff --git a/clang/lib/Sema/SemaTemplateInstantiateStmt.cpp b/clang/lib/Sema/SemaTemplateInstantiateStmt.cpp
index d635dff94c6..6d2e28aff80 100644
--- a/clang/lib/Sema/SemaTemplateInstantiateStmt.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiateStmt.cpp
@@ -314,9 +314,7 @@ TemplateStmtInstantiator::VisitCXXTryStmt(CXXTryStmt *S) {
   }
 
   return SemaRef.ActOnCXXTryBlock(S->getTryLoc(), move(TryBlock),
-                                  Sema::MultiStmtArg(SemaRef,
-                                                     Handlers.take(),
-                                                     Handlers.size()));
+                                  move_arg(Handlers));
 }
 
 Sema::OwningStmtResult
@@ -442,8 +440,5 @@ Sema::InstantiateCompoundStmt(CompoundStmt *S,
   }
 
   return ActOnCompoundStmt(S->getLBracLoc(), S->getRBracLoc(),
-                           Sema::MultiStmtArg(*this,
-                                              Statements.take(),
-                                              Statements.size()),
-                           isStmtExpr);
+                           move_arg(Statements), isStmtExpr);
 }