From: Craig Topper Date: Thu, 24 Dec 2015 23:58:29 +0000 (+0000) Subject: [Sema] ArrayRef-ize SubstExprs. NFC X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e40e96f68217e26e0ed1bec59f7c730aebd1d868;p=clang [Sema] ArrayRef-ize SubstExprs. NFC git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@256401 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/Sema/Sema.h b/include/clang/Sema/Sema.h index 8b2235d5bd..19858938c9 100644 --- a/include/clang/Sema/Sema.h +++ b/include/clang/Sema/Sema.h @@ -7008,7 +7008,7 @@ public: /// \param Outputs Will receive all of the substituted arguments. /// /// \returns true if an error occurred, false otherwise. - bool SubstExprs(Expr **Exprs, unsigned NumExprs, bool IsCall, + bool SubstExprs(ArrayRef Exprs, bool IsCall, const MultiLevelTemplateArgumentList &TemplateArgs, SmallVectorImpl &Outputs); diff --git a/lib/Sema/SemaTemplateInstantiate.cpp b/lib/Sema/SemaTemplateInstantiate.cpp index f34cb83057..fb7fc109d2 100644 --- a/lib/Sema/SemaTemplateInstantiate.cpp +++ b/lib/Sema/SemaTemplateInstantiate.cpp @@ -2664,16 +2664,17 @@ ExprResult Sema::SubstInitializer(Expr *Init, return Instantiator.TransformInitializer(Init, CXXDirectInit); } -bool Sema::SubstExprs(Expr **Exprs, unsigned NumExprs, bool IsCall, +bool Sema::SubstExprs(ArrayRef Exprs, bool IsCall, const MultiLevelTemplateArgumentList &TemplateArgs, SmallVectorImpl &Outputs) { - if (NumExprs == 0) + if (Exprs.empty()) return false; TemplateInstantiator Instantiator(*this, TemplateArgs, SourceLocation(), DeclarationName()); - return Instantiator.TransformExprs(Exprs, NumExprs, IsCall, Outputs); + return Instantiator.TransformExprs(Exprs.data(), Exprs.size(), + IsCall, Outputs); } NestedNameSpecifierLoc diff --git a/lib/Sema/TreeTransform.h b/lib/Sema/TreeTransform.h index d7dcadd0aa..e9f656826d 100644 --- a/lib/Sema/TreeTransform.h +++ b/lib/Sema/TreeTransform.h @@ -391,7 +391,7 @@ public: /// due to transformation. /// /// \returns true if an error occurred, false otherwise. - bool TransformExprs(Expr **Inputs, unsigned NumInputs, bool IsCall, + bool TransformExprs(Expr *const *Inputs, unsigned NumInputs, bool IsCall, SmallVectorImpl &Outputs, bool *ArgChanged = nullptr); @@ -3200,7 +3200,7 @@ ExprResult TreeTransform::TransformInitializer(Expr *Init, } template -bool TreeTransform::TransformExprs(Expr **Inputs, +bool TreeTransform::TransformExprs(Expr *const *Inputs, unsigned NumInputs, bool IsCall, SmallVectorImpl &Outputs,