replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Rename MTy to FTy (no methods exist anymore) 

- Fix bug: LevelRaise/2002-10-08-VarArgCallInfLoop.ll

llvm-svn: 4088
This commit is contained in:
Chris Lattner 2002-10-09 00:16:00 +00:00
parent 57c420ea47
commit a4e2653cd7
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
llvm/lib/Transforms/ExprTypeConvert.cpp
View File

@ -782,8 +782,12 @@ static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
if (OpNum == 0) { if (OpNum == 0) {
const PointerType *PTy = dyn_cast<PointerType>(Ty); const PointerType *PTy = dyn_cast<PointerType>(Ty);
if (PTy == 0) return false; // Can't convert to a non-pointer type... if (PTy == 0) return false; // Can't convert to a non-pointer type...
const FunctionType *MTy = dyn_cast<FunctionType>(PTy->getElementType()); const FunctionType *FTy = dyn_cast<FunctionType>(PTy->getElementType());
if (MTy == 0) return false; // Can't convert to a non ptr to function... if (FTy == 0) return false; // Can't convert to a non ptr to function...
// Do not allow converting to a call where all of the operands are ...'s
if (FTy->getNumParams() == 0 && FTy->isVarArg())
return false; // Do not permit this conversion!
// Perform sanity checks to make sure that new function type has the // Perform sanity checks to make sure that new function type has the
// correct number of arguments... // correct number of arguments...
@ -793,12 +797,12 @@ static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
// Cannot convert to a type that requires more fixed arguments than // Cannot convert to a type that requires more fixed arguments than
// the call provides... // the call provides...
// //
if (NumArgs < MTy->getParamTypes().size()) return false; if (NumArgs < FTy->getNumParams()) return false;
// Unless this is a vararg function type, we cannot provide more arguments // Unless this is a vararg function type, we cannot provide more arguments
// than are desired... // than are desired...
// //
if (!MTy->isVarArg() && NumArgs > MTy->getParamTypes().size()) if (!FTy->isVarArg() && NumArgs > FTy->getNumParams())
return false; return false;
// Okay, at this point, we know that the call and the function type match // Okay, at this point, we know that the call and the function type match
@ -808,7 +812,7 @@ static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
// reason for this is that we prefer to have resolved functions but casted // reason for this is that we prefer to have resolved functions but casted
// arguments if possible. // arguments if possible.
// //
const FunctionType::ParamTypes &PTs = MTy->getParamTypes(); const FunctionType::ParamTypes &PTs = FTy->getParamTypes();
for (unsigned i = 0, NA = PTs.size(); i < NA; ++i) for (unsigned i = 0, NA = PTs.size(); i < NA; ++i)
if (!PTs[i]->isLosslesslyConvertableTo(I->getOperand(i+1)->getType())) if (!PTs[i]->isLosslesslyConvertableTo(I->getOperand(i+1)->getType()))
return false; // Operands must have compatible types! return false; // Operands must have compatible types!
@ -817,14 +821,14 @@ static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
// converted. We succeed if we can change the return type if // converted. We succeed if we can change the return type if
// neccesary... // neccesary...
// //
return ValueConvertableToType(I, MTy->getReturnType(), CTMap); return ValueConvertableToType(I, FTy->getReturnType(), CTMap);
} }
const PointerType *MPtr = cast<PointerType>(I->getOperand(0)->getType()); const PointerType *MPtr = cast<PointerType>(I->getOperand(0)->getType());
const FunctionType *MTy = cast<FunctionType>(MPtr->getElementType()); const FunctionType *FTy = cast<FunctionType>(MPtr->getElementType());
if (!MTy->isVarArg()) return false; if (!FTy->isVarArg()) return false;
if ((OpNum-1) < MTy->getParamTypes().size()) if ((OpNum-1) < FTy->getParamTypes().size())
return false; // It's not in the varargs section... return false; // It's not in the varargs section...
// If we get this far, we know the value is in the varargs section of the // If we get this far, we know the value is in the varargs section of the