one more try at making this simpler, hopefully it won't break everything :)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@80759 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/IPA/CallGraphSCCPass.cpp b/lib/Analysis/IPA/CallGraphSCCPass.cpp
index d21e031..25964b2 100644
--- a/lib/Analysis/IPA/CallGraphSCCPass.cpp
+++ b/lib/Analysis/IPA/CallGraphSCCPass.cpp
@@ -178,11 +178,11 @@
"CallGraphSCCPass did not update the CallGraph correctly!");
// Just remove the edge from the set of callees.
- bool wasLast = I + 1 == E;
CGN->removeCallEdge(I);
- if (wasLast)
- // I is now a singular iterator, do not compare with E.
- break;
+
+ // If we removed the last edge, get out of the loop.
+ if (CGN->empty()) break;
+
E = CGN->end();
continue;
}