maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Use range loops. 

llvm-svn: 208353
This commit is contained in:
Rafael Espindola 2014-05-08 19:30:17 +00:00
parent 6bfee10279
commit bfe44e1dc6
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
llvm/tools/llvm-extract/llvm-extract.cpp
View File

@ -166,10 +166,9 @@ int main(int argc, char **argv) {
"invalid regex: " << Error; "invalid regex: " << Error;
} }
bool match = false; bool match = false;
for (Module::global_iterator GV = M->global_begin(), for (auto &GV : M->globals()) {
E = M->global_end(); GV != E; GV++) { if (RegEx.match(GV.getName())) {
if (RegEx.match(GV->getName())) { GVs.insert(&GV);
GVs.insert(&*GV);
match = true; match = true;
} }
} }
@ -229,22 +228,19 @@ int main(int argc, char **argv) {
else { else {
// Deleting. Materialize every GV that's *not* in GVs. // Deleting. Materialize every GV that's *not* in GVs.
SmallPtrSet<GlobalValue *, 8> GVSet(GVs.begin(), GVs.end()); SmallPtrSet<GlobalValue *, 8> GVSet(GVs.begin(), GVs.end());
for (Module::global_iterator I = M->global_begin(), E = M->global_end(); for (auto &G : M->globals()) {
I != E; ++I) { if (!GVSet.count(&G) && G.isMaterializable()) {
GlobalVariable *G = I;
if (!GVSet.count(G) && G->isMaterializable()) {
std::string ErrInfo; std::string ErrInfo;
if (G->Materialize(&ErrInfo)) { if (G.Materialize(&ErrInfo)) {
errs() << argv[0] << ": error reading input: " << ErrInfo << "\n"; errs() << argv[0] << ": error reading input: " << ErrInfo << "\n";
return 1; return 1;
} }
} }
} }
for (Module::iterator I = M->begin(), E = M->end(); I != E; ++I) { for (auto &F : *M) {
Function *F = I; if (!GVSet.count(&F) && F.isMaterializable()) {
if (!GVSet.count(F) && F->isMaterializable()) {
std::string ErrInfo; std::string ErrInfo;
if (F->Materialize(&ErrInfo)) { if (F.Materialize(&ErrInfo)) {
errs() << argv[0] << ": error reading input: " << ErrInfo << "\n"; errs() << argv[0] << ": error reading input: " << ErrInfo << "\n";
return 1; return 1;
} }