revert my patch, duncan points out what is wrong with my logic. Add
a comment so that I don't change this in the future :)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@80760 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/IPA/CallGraphSCCPass.cpp b/lib/Analysis/IPA/CallGraphSCCPass.cpp
index 25964b2..66ccb8a 100644
--- a/lib/Analysis/IPA/CallGraphSCCPass.cpp
+++ b/lib/Analysis/IPA/CallGraphSCCPass.cpp
@@ -177,12 +177,16 @@
assert(!CheckingMode &&
"CallGraphSCCPass did not update the CallGraph correctly!");
- // Just remove the edge from the set of callees.
+ // Just remove the edge from the set of callees, keep track of whether
+ // I points to the last element of the vector.
+ bool WasLast = I + 1 == E;
CGN->removeCallEdge(I);
- // If we removed the last edge, get out of the loop.
- if (CGN->empty()) break;
-
+ // If I pointed to the last element of the vector, we have to bail out:
+ // iterator checking rejects comparisons of the resultant pointer with
+ // end.
+ if (WasLast)
+ break;
E = CGN->end();
continue;
}