Use range loops.
llvm-svn: 208353
diff --git a/llvm/tools/llvm-extract/llvm-extract.cpp b/llvm/tools/llvm-extract/llvm-extract.cpp
index 769f82a..0f70868 100644
--- a/llvm/tools/llvm-extract/llvm-extract.cpp
+++ b/llvm/tools/llvm-extract/llvm-extract.cpp
@@ -166,10 +166,9 @@
"invalid regex: " << Error;
}
bool match = false;
- for (Module::global_iterator GV = M->global_begin(),
- E = M->global_end(); GV != E; GV++) {
- if (RegEx.match(GV->getName())) {
- GVs.insert(&*GV);
+ for (auto &GV : M->globals()) {
+ if (RegEx.match(GV.getName())) {
+ GVs.insert(&GV);
match = true;
}
}
@@ -229,22 +228,19 @@
else {
// Deleting. Materialize every GV that's *not* in GVs.
SmallPtrSet<GlobalValue *, 8> GVSet(GVs.begin(), GVs.end());
- for (Module::global_iterator I = M->global_begin(), E = M->global_end();
- I != E; ++I) {
- GlobalVariable *G = I;
- if (!GVSet.count(G) && G->isMaterializable()) {
+ for (auto &G : M->globals()) {
+ if (!GVSet.count(&G) && G.isMaterializable()) {
std::string ErrInfo;
- if (G->Materialize(&ErrInfo)) {
+ if (G.Materialize(&ErrInfo)) {
errs() << argv[0] << ": error reading input: " << ErrInfo << "\n";
return 1;
}
}
}
- for (Module::iterator I = M->begin(), E = M->end(); I != E; ++I) {
- Function *F = I;
- if (!GVSet.count(F) && F->isMaterializable()) {
+ for (auto &F : *M) {
+ if (!GVSet.count(&F) && F.isMaterializable()) {
std::string ErrInfo;
- if (F->Materialize(&ErrInfo)) {
+ if (F.Materialize(&ErrInfo)) {
errs() << argv[0] << ": error reading input: " << ErrInfo << "\n";
return 1;
}