From 3e61ed02993ef1d0a534b682605475d3f4ce59b9 Mon Sep 17 00:00:00 2001 From: Akira Hatanaka Date: Thu, 8 Aug 2019 23:33:17 +0000 Subject: [PATCH] Change the return type of UpgradeARCRuntimeCalls to void Nothing is using the function return. llvm-svn: 368367 --- llvm/include/llvm/IR/AutoUpgrade.h | 2 +- llvm/lib/IR/AutoUpgrade.cpp | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/llvm/include/llvm/IR/AutoUpgrade.h b/llvm/include/llvm/IR/AutoUpgrade.h index 86549a7..8613a15 100644 --- a/llvm/include/llvm/IR/AutoUpgrade.h +++ b/llvm/include/llvm/IR/AutoUpgrade.h @@ -60,7 +60,7 @@ namespace llvm { /// Convert calls to ARC runtime functions to intrinsic calls if the bitcode /// has the arm64 retainAutoreleasedReturnValue marker. - bool UpgradeARCRuntimeCalls(Module &M); + void UpgradeARCRuntimeCalls(Module &M); void UpgradeSectionAttributes(Module &M); diff --git a/llvm/lib/IR/AutoUpgrade.cpp b/llvm/lib/IR/AutoUpgrade.cpp index 2caadfd..6d13053 100644 --- a/llvm/lib/IR/AutoUpgrade.cpp +++ b/llvm/lib/IR/AutoUpgrade.cpp @@ -3854,28 +3854,26 @@ bool llvm::UpgradeRetainReleaseMarker(Module &M) { return Changed; } -bool llvm::UpgradeARCRuntimeCalls(Module &M) { +void llvm::UpgradeARCRuntimeCalls(Module &M) { auto UpgradeToIntrinsic = [&](const char *OldFunc, llvm::Intrinsic::ID IntrinsicFunc) { Function *Fn = M.getFunction(OldFunc); if (!Fn) - return false; + return; Function *NewFn = llvm::Intrinsic::getDeclaration(&M, IntrinsicFunc); Fn->replaceAllUsesWith(NewFn); Fn->eraseFromParent(); - return true; }; // Unconditionally convert "clang.arc.use" to "llvm.objc.clang.arc.use". - bool Changed = - UpgradeToIntrinsic("clang.arc.use", llvm::Intrinsic::objc_clang_arc_use); + UpgradeToIntrinsic("clang.arc.use", llvm::Intrinsic::objc_clang_arc_use); // Return if the bitcode doesn't have the arm64 retainAutoreleasedReturnValue // marker. We don't know for sure that it was compiled with ARC in that case. if (!M.getModuleFlag("clang.arc.retainAutoreleasedReturnValueMarker")) - return false; + return; std::pair RuntimeFuncs[] = { {"objc_autorelease", llvm::Intrinsic::objc_autorelease}, @@ -3917,9 +3915,7 @@ bool llvm::UpgradeARCRuntimeCalls(Module &M) { llvm::Intrinsic::objc_arc_annotation_bottomup_bbend}}; for (auto &I : RuntimeFuncs) - Changed |= UpgradeToIntrinsic(I.first, I.second); - - return Changed; + UpgradeToIntrinsic(I.first, I.second); } bool llvm::UpgradeModuleFlags(Module &M) { -- 2.7.4