Changes in directory llvm/tools/llvm-upgrade:
UpgradeParser.cpp.cvs updated: 1.56 -> 1.57 UpgradeParser.y updated: 1.57 -> 1.58 UpgradeParser.y.cvs updated: 1.55 -> 1.56 --- Log message: For PR411: http://llvm.org/PR411 : Adjust to changes in Module interface: getMainFunction() -> getFunction("main") getNamedFunction(X) -> getFunction(X) --- Diffs of the changes: (+18 -18) UpgradeParser.cpp.cvs | 12 ++++++------ UpgradeParser.y | 12 ++++++------ UpgradeParser.y.cvs | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) Index: llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs diff -u llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs:1.56 llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs:1.57 --- llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs:1.56 Mon Feb 5 14:47:21 2007 +++ llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs Mon Feb 5 15:19:13 2007 @@ -929,7 +929,7 @@ if (const FunctionType *FTy = dyn_cast<FunctionType>(PTy->getElementType())) if (Function *OtherF = - CurModule.CurrentModule->getNamedFunction(DID.getName())) + CurModule.CurrentModule->getFunction(DID.getName())) if (FuncTysDifferOnlyBySRet(FTy,OtherF->getFunctionType())) { V->replaceAllUsesWith(ConstantExpr::getBitCast(OtherF, PTy)); fixed = true; @@ -1677,10 +1677,10 @@ //Not all functions use vaarg, so make a second check for ObsoleteVarArgs { Function* F; - if ((F = Result->getNamedFunction("llvm.va_start")) + if ((F = Result->getFunction("llvm.va_start")) && F->getFunctionType()->getNumParams() == 0) ObsoleteVarArgs = true; - if((F = Result->getNamedFunction("llvm.va_copy")) + if((F = Result->getFunction("llvm.va_copy")) && F->getFunctionType()->getNumParams() == 1) ObsoleteVarArgs = true; } @@ -1691,7 +1691,7 @@ } if(ObsoleteVarArgs) { - if(Function* F = Result->getNamedFunction("llvm.va_start")) { + if(Function* F = Result->getFunction("llvm.va_start")) { if (F->arg_size() != 0) { error("Obsolete va_start takes 0 argument"); return 0; @@ -1720,7 +1720,7 @@ Result->getFunctionList().erase(F); } - if(Function* F = Result->getNamedFunction("llvm.va_end")) { + if(Function* F = Result->getFunction("llvm.va_end")) { if(F->arg_size() != 1) { error("Obsolete va_end takes 1 argument"); return 0; @@ -1746,7 +1746,7 @@ Result->getFunctionList().erase(F); } - if(Function* F = Result->getNamedFunction("llvm.va_copy")) { + if(Function* F = Result->getFunction("llvm.va_copy")) { if(F->arg_size() != 1) { error("Obsolete va_copy takes 1 argument"); return 0; Index: llvm/tools/llvm-upgrade/UpgradeParser.y diff -u llvm/tools/llvm-upgrade/UpgradeParser.y:1.57 llvm/tools/llvm-upgrade/UpgradeParser.y:1.58 --- llvm/tools/llvm-upgrade/UpgradeParser.y:1.57 Mon Feb 5 14:47:21 2007 +++ llvm/tools/llvm-upgrade/UpgradeParser.y Mon Feb 5 15:19:13 2007 @@ -569,7 +569,7 @@ if (const FunctionType *FTy = dyn_cast<FunctionType>(PTy->getElementType())) if (Function *OtherF = - CurModule.CurrentModule->getNamedFunction(DID.getName())) + CurModule.CurrentModule->getFunction(DID.getName())) if (FuncTysDifferOnlyBySRet(FTy,OtherF->getFunctionType())) { V->replaceAllUsesWith(ConstantExpr::getBitCast(OtherF, PTy)); fixed = true; @@ -1317,10 +1317,10 @@ //Not all functions use vaarg, so make a second check for ObsoleteVarArgs { Function* F; - if ((F = Result->getNamedFunction("llvm.va_start")) + if ((F = Result->getFunction("llvm.va_start")) && F->getFunctionType()->getNumParams() == 0) ObsoleteVarArgs = true; - if((F = Result->getNamedFunction("llvm.va_copy")) + if((F = Result->getFunction("llvm.va_copy")) && F->getFunctionType()->getNumParams() == 1) ObsoleteVarArgs = true; } @@ -1331,7 +1331,7 @@ } if(ObsoleteVarArgs) { - if(Function* F = Result->getNamedFunction("llvm.va_start")) { + if(Function* F = Result->getFunction("llvm.va_start")) { if (F->arg_size() != 0) { error("Obsolete va_start takes 0 argument"); return 0; @@ -1360,7 +1360,7 @@ Result->getFunctionList().erase(F); } - if(Function* F = Result->getNamedFunction("llvm.va_end")) { + if(Function* F = Result->getFunction("llvm.va_end")) { if(F->arg_size() != 1) { error("Obsolete va_end takes 1 argument"); return 0; @@ -1386,7 +1386,7 @@ Result->getFunctionList().erase(F); } - if(Function* F = Result->getNamedFunction("llvm.va_copy")) { + if(Function* F = Result->getFunction("llvm.va_copy")) { if(F->arg_size() != 1) { error("Obsolete va_copy takes 1 argument"); return 0; Index: llvm/tools/llvm-upgrade/UpgradeParser.y.cvs diff -u llvm/tools/llvm-upgrade/UpgradeParser.y.cvs:1.55 llvm/tools/llvm-upgrade/UpgradeParser.y.cvs:1.56 --- llvm/tools/llvm-upgrade/UpgradeParser.y.cvs:1.55 Mon Feb 5 14:47:21 2007 +++ llvm/tools/llvm-upgrade/UpgradeParser.y.cvs Mon Feb 5 15:19:13 2007 @@ -569,7 +569,7 @@ if (const FunctionType *FTy = dyn_cast<FunctionType>(PTy->getElementType())) if (Function *OtherF = - CurModule.CurrentModule->getNamedFunction(DID.getName())) + CurModule.CurrentModule->getFunction(DID.getName())) if (FuncTysDifferOnlyBySRet(FTy,OtherF->getFunctionType())) { V->replaceAllUsesWith(ConstantExpr::getBitCast(OtherF, PTy)); fixed = true; @@ -1317,10 +1317,10 @@ //Not all functions use vaarg, so make a second check for ObsoleteVarArgs { Function* F; - if ((F = Result->getNamedFunction("llvm.va_start")) + if ((F = Result->getFunction("llvm.va_start")) && F->getFunctionType()->getNumParams() == 0) ObsoleteVarArgs = true; - if((F = Result->getNamedFunction("llvm.va_copy")) + if((F = Result->getFunction("llvm.va_copy")) && F->getFunctionType()->getNumParams() == 1) ObsoleteVarArgs = true; } @@ -1331,7 +1331,7 @@ } if(ObsoleteVarArgs) { - if(Function* F = Result->getNamedFunction("llvm.va_start")) { + if(Function* F = Result->getFunction("llvm.va_start")) { if (F->arg_size() != 0) { error("Obsolete va_start takes 0 argument"); return 0; @@ -1360,7 +1360,7 @@ Result->getFunctionList().erase(F); } - if(Function* F = Result->getNamedFunction("llvm.va_end")) { + if(Function* F = Result->getFunction("llvm.va_end")) { if(F->arg_size() != 1) { error("Obsolete va_end takes 1 argument"); return 0; @@ -1386,7 +1386,7 @@ Result->getFunctionList().erase(F); } - if(Function* F = Result->getNamedFunction("llvm.va_copy")) { + if(Function* F = Result->getFunction("llvm.va_copy")) { if(F->arg_size() != 1) { error("Obsolete va_copy takes 1 argument"); return 0; _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits