Merging r168622: into 3.2 release branch.

32bitmicro · 32bitmicro · commit f56817cfb593 · 2012-11-29T22:11:02.000Z
Don't use iterator after being erased. git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_32@168947 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/MachineCSE.cpp b/lib/CodeGen/MachineCSE.cpp
@@ -429,8 +429,8 @@ void MachineCSE::ExitScope(MachineBasicBlock *MBB) {
   DEBUG(dbgs() << "Exiting: " << MBB->getName() << '\n');
   DenseMap<MachineBasicBlock*, ScopeType*>::iterator SI = ScopeMap.find(MBB);
   assert(SI != ScopeMap.end());
-  ScopeMap.erase(SI);
   delete SI->second;
+  ScopeMap.erase(SI);
 }
 
 bool MachineCSE::ProcessBlock(MachineBasicBlock *MBB) {

Original file line number	Diff line number	Diff line change
`@@ -429,8 +429,8 @@ void MachineCSE::ExitScope(MachineBasicBlock *MBB) {`
`429`	`429`	`DEBUG(dbgs() << "Exiting: " << MBB->getName() << '\n');`
`430`	`430`	`DenseMap<MachineBasicBlock, ScopeType>::iterator SI = ScopeMap.find(MBB);`
`431`	`431`	`assert(SI != ScopeMap.end());`
`432`		`- ScopeMap.erase(SI);`
`433`	`432`	`delete SI->second;`
	`433`	`+ ScopeMap.erase(SI);`
`434`	`434`	`}`
`435`	`435`
`436`	`436`	`bool MachineCSE::ProcessBlock(MachineBasicBlock *MBB) {`