From 986477149db76e6d9f8d3c9859c9880c11b680ae Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Wed, 27 May 2009 01:22:39 +0000 Subject: [PATCH] Rename an EmitCallExpr function to EmitCall to make it clear that it doesn't emit an expr. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@72446 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGBuiltin.cpp | 6 +++--- lib/CodeGen/CGExpr.cpp | 12 ++++++------ lib/CodeGen/CodeGenFunction.h | 12 +++++------- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/lib/CodeGen/CGBuiltin.cpp b/lib/CodeGen/CGBuiltin.cpp index 6692b6cd9f..a73be2c60e 100644 --- a/lib/CodeGen/CGBuiltin.cpp +++ b/lib/CodeGen/CGBuiltin.cpp @@ -517,9 +517,9 @@ RValue CodeGenFunction::EmitBuiltinExpr(const FunctionDecl *FD, // that function. if (getContext().BuiltinInfo.isLibFunction(BuiltinID) || getContext().BuiltinInfo.isPredefinedLibFunction(BuiltinID)) - return EmitCallExpr(CGM.getBuiltinLibFunction(BuiltinID), - E->getCallee()->getType(), E->arg_begin(), - E->arg_end()); + return EmitCall(CGM.getBuiltinLibFunction(BuiltinID), + E->getCallee()->getType(), E->arg_begin(), + E->arg_end()); // See if we have a target specific intrinsic. const char *Name = getContext().BuiltinInfo.GetName(BuiltinID); diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp index ad96d2e573..f6081c61f9 100644 --- a/lib/CodeGen/CGExpr.cpp +++ b/lib/CodeGen/CGExpr.cpp @@ -1137,8 +1137,8 @@ RValue CodeGenFunction::EmitCallExpr(const CallExpr *E) { } llvm::Value *Callee = EmitScalarExpr(E->getCallee()); - return EmitCallExpr(Callee, E->getCallee()->getType(), - E->arg_begin(), E->arg_end(), TargetDecl); + return EmitCall(Callee, E->getCallee()->getType(), + E->arg_begin(), E->arg_end(), TargetDecl); } LValue CodeGenFunction::EmitBinaryOperatorLValue(const BinaryOperator *E) { @@ -1255,10 +1255,10 @@ LValue CodeGenFunction::EmitStmtExprLValue(const StmtExpr *E) { } -RValue CodeGenFunction::EmitCallExpr(llvm::Value *Callee, QualType CalleeType, - CallExpr::const_arg_iterator ArgBeg, - CallExpr::const_arg_iterator ArgEnd, - const Decl *TargetDecl) { +RValue CodeGenFunction::EmitCall(llvm::Value *Callee, QualType CalleeType, + CallExpr::const_arg_iterator ArgBeg, + CallExpr::const_arg_iterator ArgEnd, + const Decl *TargetDecl) { // Get the actual function type. The callee type will always be a // pointer to function type or a block pointer type. assert(CalleeType->isFunctionPointerType() && diff --git a/lib/CodeGen/CodeGenFunction.h b/lib/CodeGen/CodeGenFunction.h index d87fbcdeb5..28c557c156 100644 --- a/lib/CodeGen/CodeGenFunction.h +++ b/lib/CodeGen/CodeGenFunction.h @@ -672,7 +672,11 @@ public: llvm::Value *Callee, const CallArgList &Args, const Decl *TargetDecl = 0); - + + RValue EmitCall(llvm::Value *Callee, QualType FnType, + CallExpr::const_arg_iterator ArgBeg, + CallExpr::const_arg_iterator ArgEnd, + const Decl *TargetDecl = 0); RValue EmitCallExpr(const CallExpr *E); RValue EmitCXXMemberCall(const CXXMethodDecl *MD, @@ -680,14 +684,8 @@ public: llvm::Value *This, CallExpr::const_arg_iterator ArgBeg, CallExpr::const_arg_iterator ArgEnd); - RValue EmitCXXMemberCallExpr(const CXXMemberCallExpr *E); - RValue EmitCallExpr(llvm::Value *Callee, QualType FnType, - CallExpr::const_arg_iterator ArgBeg, - CallExpr::const_arg_iterator ArgEnd, - const Decl *TargetDecl = 0); - RValue EmitBuiltinExpr(const FunctionDecl *FD, unsigned BuiltinID, const CallExpr *E); -- 2.40.0