maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Make sure to emit all the arguments to a function call. This fixes the 

codegen of calls to functions without a prototype and varargs functions, 
including printf.

llvm-svn: 46543
This commit is contained in:
Eli Friedman 2008-01-30 01:32:06 +00:00
parent 4e4b116750
commit 9d92ce8b3a
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/CodeGen/CGBuiltin.cpp
View File

@ -30,7 +30,8 @@ RValue CodeGenFunction::EmitBuiltinExpr(unsigned BuiltinID, const CallExpr *E) {
default: {
if (getContext().BuiltinInfo.isLibFunction(BuiltinID))
return EmitCallExpr(CGM.getBuiltinLibFunction(BuiltinID),
E->getCallee()->getType(), E->arg_begin());
E->getCallee()->getType(), E->arg_begin(),
E->getNumArgs());
// See if we have a target specific intrinsic.
Intrinsic::ID IntrinsicID;

17
clang/CodeGen/CGExpr.cpp
View File

@ -511,12 +511,14 @@ RValue CodeGenFunction::EmitCallExpr(const CallExpr *E) {
return EmitBuiltinExpr(builtinID, E);
llvm::Value *Callee = EmitScalarExpr(E->getCallee());
return EmitCallExpr(Callee, E->getCallee()->getType(), E->arg_begin());
return EmitCallExpr(Callee, E->getCallee()->getType(),
E->arg_begin(), E->getNumArgs());
}
RValue CodeGenFunction::EmitCallExpr(Expr *FnExpr, Expr *const *Args) {
RValue CodeGenFunction::EmitCallExpr(Expr *FnExpr, Expr *const *Args,
unsigned NumArgs) {
llvm::Value *Callee = EmitScalarExpr(FnExpr);
return EmitCallExpr(Callee, FnExpr->getType(), Args);
return EmitCallExpr(Callee, FnExpr->getType(), Args, NumArgs);
}
LValue CodeGenFunction::EmitCallExprLValue(const CallExpr *E) {
@ -526,17 +528,12 @@ LValue CodeGenFunction::EmitCallExprLValue(const CallExpr *E) {
}
RValue CodeGenFunction::EmitCallExpr(llvm::Value *Callee, QualType FnType,
Expr *const *ArgExprs) {
Expr *const *ArgExprs, unsigned NumArgs) {
// The callee type will always be a pointer to function type, get the function
// type.
FnType = cast<PointerType>(FnType.getCanonicalType())->getPointeeType();
QualType ResultType = cast<FunctionType>(FnType)->getResultType();
// Calling unprototyped functions provides no argument info.
unsigned NumArgs = 0;
if (const FunctionTypeProto *FTP = dyn_cast<FunctionTypeProto>(FnType))
NumArgs = FTP->getNumArgs();
llvm::SmallVector<llvm::Value*, 16> Args;
// Handle struct-return functions by passing a pointer to the location that

2
clang/CodeGen/CGExprScalar.cpp
View File

@ -1012,7 +1012,7 @@ Value *ScalarExprEmitter::VisitChooseExpr(ChooseExpr *E) {
}
Value *ScalarExprEmitter::VisitOverloadExpr(OverloadExpr *E) {
return CGF.EmitCallExpr(E->getFn(), E->arg_begin()).getScalarVal();
return CGF.EmitCallExpr(E->getFn(), E->arg_begin(), E->getNumArgs()).getScalarVal();
}
Value *ScalarExprEmitter::VisitVAArgExpr(VAArgExpr *VE) {

5
clang/CodeGen/CodeGenFunction.h
View File

@ -419,8 +419,9 @@ public:
//===--------------------------------------------------------------------===//
RValue EmitCallExpr(const CallExpr *E);
RValue EmitCallExpr(Expr *FnExpr, Expr *const *Args);
RValue EmitCallExpr(llvm::Value *Callee, QualType FnType, Expr *const *Args);
RValue EmitCallExpr(Expr *FnExpr, Expr *const *Args, unsigned NumArgs);
RValue EmitCallExpr(llvm::Value *Callee, QualType FnType,
Expr *const *Args, unsigned NumArgs);
RValue EmitBuiltinExpr(unsigned BuiltinID, const CallExpr *E);
llvm::Value *EmitX86BuiltinExpr(unsigned BuiltinID, const CallExpr *E);