diff options
Diffstat (limited to 'lib/Transforms/IPO')
| -rw-r--r-- | lib/Transforms/IPO/FunctionResolution.cpp | 14 | ||||
| -rw-r--r-- | lib/Transforms/IPO/MutateStructTypes.cpp | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/lib/Transforms/IPO/FunctionResolution.cpp b/lib/Transforms/IPO/FunctionResolution.cpp index 8361930e94..d0179809b9 100644 --- a/lib/Transforms/IPO/FunctionResolution.cpp +++ b/lib/Transforms/IPO/FunctionResolution.cpp @@ -58,7 +58,7 @@ static bool ResolveFunctions(Module &M, std::vector<GlobalValue*> &Globals, const FunctionType *OldMT = Old->getFunctionType(); const FunctionType *ConcreteMT = Concrete->getFunctionType(); - if (OldMT->getParamTypes().size() > ConcreteMT->getParamTypes().size() && + if (OldMT->getNumParams() > ConcreteMT->getNumParams() && !ConcreteMT->isVarArg()) if (!Old->use_empty()) { std::cerr << "WARNING: Linking function '" << Old->getName() @@ -73,14 +73,14 @@ static bool ResolveFunctions(Module &M, std::vector<GlobalValue*> &Globals, // Check to make sure that if there are specified types, that they // match... // - unsigned NumArguments = std::min(OldMT->getParamTypes().size(), - ConcreteMT->getParamTypes().size()); + unsigned NumArguments = std::min(OldMT->getNumParams(), + ConcreteMT->getNumParams()); if (!Old->use_empty() && !Concrete->use_empty()) for (unsigned i = 0; i < NumArguments; ++i) - if (OldMT->getParamTypes()[i] != ConcreteMT->getParamTypes()[i]) - if (OldMT->getParamTypes()[i]->getPrimitiveID() != - ConcreteMT->getParamTypes()[i]->getPrimitiveID()) { + if (OldMT->getParamType(i) != ConcreteMT->getParamType(i)) + if (OldMT->getParamType(i)->getPrimitiveID() != + ConcreteMT->getParamType(i)->getPrimitiveID()) { std::cerr << "WARNING: Function [" << Old->getName() << "]: Parameter types conflict for: '"; WriteTypeSymbolic(std::cerr, OldMT, &M); @@ -231,7 +231,7 @@ static bool ProcessGlobalsWithSameName(Module &M, TargetData &TD, if ((ConcreteF->getReturnType() == OtherF->getReturnType() || CallersAllIgnoreReturnValue(*OtherF)) && OtherF->getFunctionType()->isVarArg() && - OtherF->getFunctionType()->getParamTypes().empty()) + OtherF->getFunctionType()->getNumParams() == 0) DontPrintWarning = true; // Otherwise, if the non-concrete global is a global array variable with a diff --git a/lib/Transforms/IPO/MutateStructTypes.cpp b/lib/Transforms/IPO/MutateStructTypes.cpp index e2c362f3ab..d5bf4c3bfa 100644 --- a/lib/Transforms/IPO/MutateStructTypes.cpp +++ b/lib/Transforms/IPO/MutateStructTypes.cpp @@ -60,8 +60,8 @@ const Type *MutateStructTypes::ConvertType(const Type *Ty) { const Type *RetTy = ConvertType(FT->getReturnType()); std::vector<const Type*> ArgTypes; - for (FunctionType::ParamTypes::const_iterator I = FT->getParamTypes().begin(), - E = FT->getParamTypes().end(); I != E; ++I) + for (FunctionType::param_iterator I = FT->param_begin(), + E = FT->param_end(); I != E; ++I) ArgTypes.push_back(ConvertType(*I)); DestTy = FunctionType::get(RetTy, ArgTypes, FT->isVarArg()); |