Rename an EmitCallExpr function to EmitCall to make it clear that it doesn't emit...

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@72446 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/CGBuiltin.cpp b/lib/CodeGen/CGBuiltin.cpp
index 6692b6cd9f998e2f698cb4e1b18fec077114d39d..a73be2c60e8ff08c2dc24f243075e7f565055f7f 100644 (file)
--- 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 ad96d2e573dda902306f6754a71d97b8b4087f7d..f6081c61f9c01b58f3b21c97ec9ce1d27cfd2440 100644 (file)
--- 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 d87fbcdeb5d344ed3e8cddff639232004bfd3a80..28c557c15617236c4f22e2d62aec80eddcd0001e 100644 (file)
--- 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);