mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-01-14 00:32:55 +00:00
Fix a bug resolving sprintf(...) to sprintf(char*, char*, ...)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@5446 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
bae362f8fc
commit
49f2012140
@ -48,7 +48,10 @@ static void ConvertCallTo(CallInst *CI, Function *Dest) {
|
|||||||
// argument types don't agree.
|
// argument types don't agree.
|
||||||
//
|
//
|
||||||
BasicBlock::iterator BBI = CI;
|
BasicBlock::iterator BBI = CI;
|
||||||
if (CI->getNumOperands()-1 != ParamTys.size()) {
|
unsigned NumArgsToCopy = CI->getNumOperands()-1;
|
||||||
|
if (CI->getNumOperands()-1 != ParamTys.size() &&
|
||||||
|
!(CI->getNumOperands()-1 > ParamTys.size() &&
|
||||||
|
Dest->getFunctionType()->isVarArg())) {
|
||||||
std::cerr << "WARNING: Call arguments do not match expected number of"
|
std::cerr << "WARNING: Call arguments do not match expected number of"
|
||||||
<< " parameters.\n";
|
<< " parameters.\n";
|
||||||
std::cerr << "WARNING: In function '"
|
std::cerr << "WARNING: In function '"
|
||||||
@ -62,11 +65,13 @@ static void ConvertCallTo(CallInst *CI, Function *Dest) {
|
|||||||
|
|
||||||
// Convert all of the call arguments over... inserting cast instructions if
|
// Convert all of the call arguments over... inserting cast instructions if
|
||||||
// the types are not compatible.
|
// the types are not compatible.
|
||||||
for (unsigned i = 1; i <= ParamTys.size(); ++i) {
|
for (unsigned i = 1; i <= NumArgsToCopy; ++i) {
|
||||||
Value *V = CI->getOperand(i);
|
Value *V = CI->getOperand(i);
|
||||||
|
|
||||||
if (V->getType() != ParamTys[i-1]) // Must insert a cast...
|
if (i-1 < ParamTys.size() && V->getType() != ParamTys[i-1]) {
|
||||||
|
// Must insert a cast...
|
||||||
V = new CastInst(V, ParamTys[i-1], "argcast", BBI);
|
V = new CastInst(V, ParamTys[i-1], "argcast", BBI);
|
||||||
|
}
|
||||||
|
|
||||||
Params.push_back(V);
|
Params.push_back(V);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user