[llvm] r242275 - [PM/AA] Cleanup some loops to be range-based. NFC.
Chandler Carruth
chandlerc at gmail.com
Wed Jul 15 01:09:24 PDT 2015
Author: chandlerc
Date: Wed Jul 15 03:09:23 2015
New Revision: 242275
URL: http://llvm.org/viewvc/llvm-project?rev=242275&view=rev
Log:
[PM/AA] Cleanup some loops to be range-based. NFC.
Modified:
llvm/trunk/lib/Analysis/IPA/GlobalsModRef.cpp
Modified: llvm/trunk/lib/Analysis/IPA/GlobalsModRef.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/IPA/GlobalsModRef.cpp?rev=242275&r1=242274&r2=242275&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/IPA/GlobalsModRef.cpp (original)
+++ llvm/trunk/lib/Analysis/IPA/GlobalsModRef.cpp Wed Jul 15 03:09:23 2015
@@ -207,35 +207,34 @@ Pass *llvm::createGlobalsModRefPass() {
/// and record the functions that they are used directly in.
void GlobalsModRef::AnalyzeGlobals(Module &M) {
std::vector<Function *> Readers, Writers;
- for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I)
- if (I->hasLocalLinkage()) {
- if (!AnalyzeUsesOfPointer(I, Readers, Writers)) {
+ for (Function &F : M)
+ if (F.hasLocalLinkage()) {
+ if (!AnalyzeUsesOfPointer(&F, Readers, Writers)) {
// Remember that we are tracking this global.
- NonAddressTakenGlobals.insert(I);
+ NonAddressTakenGlobals.insert(&F);
++NumNonAddrTakenFunctions;
}
Readers.clear();
Writers.clear();
}
- for (Module::global_iterator I = M.global_begin(), E = M.global_end(); I != E;
- ++I)
- if (I->hasLocalLinkage()) {
- if (!AnalyzeUsesOfPointer(I, Readers, Writers)) {
+ for (GlobalVariable &GV : M.globals())
+ if (GV.hasLocalLinkage()) {
+ if (!AnalyzeUsesOfPointer(&GV, Readers, Writers)) {
// Remember that we are tracking this global, and the mod/ref fns
- NonAddressTakenGlobals.insert(I);
+ NonAddressTakenGlobals.insert(&GV);
- for (unsigned i = 0, e = Readers.size(); i != e; ++i)
- FunctionInfo[Readers[i]].GlobalInfo[I] |= Ref;
+ for (Function *Reader : Readers)
+ FunctionInfo[Reader].GlobalInfo[&GV] |= Ref;
- if (!I->isConstant()) // No need to keep track of writers to constants
- for (unsigned i = 0, e = Writers.size(); i != e; ++i)
- FunctionInfo[Writers[i]].GlobalInfo[I] |= Mod;
+ if (!GV.isConstant()) // No need to keep track of writers to constants
+ for (Function *Writer : Writers)
+ FunctionInfo[Writer].GlobalInfo[&GV] |= Mod;
++NumNonAddrTakenGlobalVars;
// If this global holds a pointer type, see if it is an indirect global.
- if (I->getType()->getElementType()->isPointerTy() &&
- AnalyzeIndirectGlobalMemory(I))
+ if (GV.getType()->getElementType()->isPointerTy() &&
+ AnalyzeIndirectGlobalMemory(&GV))
++NumIndirectGlobalVars;
}
Readers.clear();
@@ -370,8 +369,8 @@ void GlobalsModRef::AnalyzeCallGraph(Cal
if (!SCC[0]->getFunction()) {
// Calls externally - can't say anything useful. Remove any existing
// function records (may have been created when scanning globals).
- for (unsigned i = 0, e = SCC.size(); i != e; ++i)
- FunctionInfo.erase(SCC[i]->getFunction());
+ for (auto *Node : SCC)
+ FunctionInfo.erase(Node->getFunction());
continue;
}
@@ -434,8 +433,8 @@ void GlobalsModRef::AnalyzeCallGraph(Cal
// If we can't say anything useful about this SCC, remove all SCC functions
// from the FunctionInfo map.
if (KnowNothing) {
- for (unsigned i = 0, e = SCC.size(); i != e; ++i)
- FunctionInfo.erase(SCC[i]->getFunction());
+ for (auto *Node : SCC)
+ FunctionInfo.erase(Node->getFunction());
continue;
}
More information about the llvm-commits
mailing list