diff options
author | Chris Lattner <sabre@nondot.org> | 2009-09-01 18:13:40 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2009-09-01 18:13:40 +0000 |
commit | 17146b867f72c2ca020e2ba8b0b6cbba93a1f7c8 (patch) | |
tree | 784a535e72a74625af7052ea937a16ad7822c6e2 | |
parent | f41eaacee4a4a2d4339dd553626d98c73650c8c7 (diff) | |
download | external_llvm-17146b867f72c2ca020e2ba8b0b6cbba93a1f7c8.zip external_llvm-17146b867f72c2ca020e2ba8b0b6cbba93a1f7c8.tar.gz external_llvm-17146b867f72c2ca020e2ba8b0b6cbba93a1f7c8.tar.bz2 |
simpler solution to iterator invalidation "problem" found
by expensive checking.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@80695 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/Analysis/IPA/CallGraphSCCPass.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/lib/Analysis/IPA/CallGraphSCCPass.cpp b/lib/Analysis/IPA/CallGraphSCCPass.cpp index beb4e6f..7e9fd30 100644 --- a/lib/Analysis/IPA/CallGraphSCCPass.cpp +++ b/lib/Analysis/IPA/CallGraphSCCPass.cpp @@ -143,16 +143,11 @@ void CGPassManager::RefreshCallGraph(std::vector<CallGraphNode*> &CurSCC, // Walk the function body looking for call sites. Sync up the call sites in // CGN with those actually in the function. - + // Get the set of call sites currently in the function. - bool isLast = CGN->empty(); - for (CallGraphNode::iterator I = CGN->begin(), E = CGN->end(), N; !isLast;){ - // Take care not to use singular iterators. - N = I + 1; - isLast = N == E; - + for (CallGraphNode::iterator I = CGN->begin(), E = CGN->end(); I != E; ){ // If this call site is null, then the function pass deleted the call - // entirely and the WeakVH nulled it out. + // entirely and the WeakVH nulled it out. if (I->first == 0 || // If we've already seen this call site, then the FunctionPass RAUW'd // one call with another, which resulted in two "uses" in the edge @@ -168,13 +163,13 @@ void CGPassManager::RefreshCallGraph(std::vector<CallGraphNode*> &CurSCC, E = CGN->end(); continue; } - + assert(!CallSites.count(I->first) && "Call site occurs in node multiple times"); CallSites.insert(std::make_pair(I->first, I->second)); - I = N; + ++I; } - + // Loop over all of the instructions in the function, getting the callsites. for (Function::iterator BB = F->begin(), E = F->end(); BB != E; ++BB) for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I) { |