From cbbe82732a23fc850d790b8cb8b701af51160f17 Mon Sep 17 00:00:00 2001
From: akashk4 <akashk4@illinois.edu>
Date: Tue, 31 Dec 2019 08:45:51 -0600
Subject: [PATCH] Eliminating some explicit use of iterators in loops.
---
.../hpvm/lib/Transforms/GenVISC/GenVISC.cpp | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/llvm/tools/hpvm/lib/Transforms/GenVISC/GenVISC.cpp b/llvm/tools/hpvm/lib/Transforms/GenVISC/GenVISC.cpp
index b1d265b132..43140244ff 100644
--- a/llvm/tools/hpvm/lib/Transforms/GenVISC/GenVISC.cpp
+++ b/llvm/tools/hpvm/lib/Transforms/GenVISC/GenVISC.cpp
@@ -801,9 +801,10 @@ static void replaceOpenCLCallsWithVISCIntrinsics(Function *F) {
}
}
- for (std::vector<CallInst *>::reverse_iterator ri = IItoRemove.rbegin(),
- re = IItoRemove.rend(); ri != re; ++ri)
- (*ri)->eraseFromParent();
+//for (std::vector<CallInst *>::reverse_iterator ri = IItoRemove.rbegin(),
+ // re = IItoRemove.rend(); ri != re; ++ri)
+ for (CallInst *CI : reverse(IItoRemove))
+ CI->eraseFromParent();
}
@@ -866,14 +867,11 @@ bool GenVISC::runOnModule(Module &M) {
std::vector<Instruction*> toBeErased;
std::vector<Function*> functions;
- for (Module::iterator mi = M.begin(), me = M.end(); mi != me; ++mi) {
- Function* f = &*mi;
- functions.push_back(f);
- }
+ for (auto &F : M)
+ functions.push_back(&F);
// Iterate over all functions in the module
- for (unsigned i = 0; i < functions.size(); i++) {
- Function* f = functions[i];
+ for (Function *f : functions) {
DEBUG(errs() << "Function: " << f->getName() << "\n");
// List with the required additions in the function's return type
@@ -1646,7 +1644,7 @@ static Function* transformReturnTypeToStruct(Function* F) {
SmallVector<ReturnInst*, 8> Returns;
Function* newF = cloneFunction(F, FTy, false, &Returns);
// Replace ret void instruction with ret %RetTy undef
- for(auto RI: Returns) {
+ for(auto &RI: Returns) {
DEBUG(errs() << "Found return inst: "<< *RI << "\n");
ReturnInst* newRI = ReturnInst::Create(newF->getContext(), UndefValue::get(RetTy));
ReplaceInstWithInst(RI, newRI);
--
GitLab