diff options
| -rw-r--r-- | include/llvm/ADT/SCCIterator.h | 5 | ||||
| -rw-r--r-- | lib/Analysis/IPA/CallGraphSCCPass.cpp | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/include/llvm/ADT/SCCIterator.h b/include/llvm/ADT/SCCIterator.h index 80eb8c55b2..c49d599cf3 100644 --- a/include/llvm/ADT/SCCIterator.h +++ b/include/llvm/ADT/SCCIterator.h @@ -66,7 +66,7 @@ class scc_iterator std::vector<unsigned> MinVisitNumStack; // A single "visit" within the non-recursive DFS traversal. - void DFSVisitOne(NodeType* N) { + void DFSVisitOne(NodeType *N) { ++visitNum; // Global counter for the visit order nodeVisitNumbers[N] = visitNum; SCCNodeStack.push_back(N); @@ -83,7 +83,7 @@ class scc_iterator // TOS has at least one more child so continue DFS NodeType *childN = *VisitStack.back().second++; if (!nodeVisitNumbers.count(childN)) { - // this node has never been seen + // this node has never been seen. DFSVisitOne(childN); continue; } @@ -187,7 +187,6 @@ public: /// ReplaceNode - This informs the scc_iterator that the specified Old node /// has been deleted, and New is to be used in its place. void ReplaceNode(NodeType *Old, NodeType *New) { - assert(!nodeVisitNumbers.count(New) && "New already in scc_iterator?"); assert(nodeVisitNumbers.count(Old) && "Old not in scc_iterator?"); nodeVisitNumbers[New] = nodeVisitNumbers[Old]; nodeVisitNumbers.erase(Old); diff --git a/lib/Analysis/IPA/CallGraphSCCPass.cpp b/lib/Analysis/IPA/CallGraphSCCPass.cpp index cf4c0d2549..7b73c5dffc 100644 --- a/lib/Analysis/IPA/CallGraphSCCPass.cpp +++ b/lib/Analysis/IPA/CallGraphSCCPass.cpp @@ -420,10 +420,8 @@ void CallGraphSCC::ReplaceNode(CallGraphNode *Old, CallGraphNode *New) { // Update the active scc_iterator so that it doesn't contain dangling // pointers to the old CallGraphNode. -#if 0 scc_iterator<CallGraph*> *CGI = (scc_iterator<CallGraph*>*)Context; CGI->ReplaceNode(Old, New); -#endif } |