maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix bug: test/Regression/Transforms/InstCombine/2002-05-14-TouchDeletedInst.ll 

"This testcase caused instcombine to fail because it got the same instruction on
it's worklist more than once (which is ok), but then deleted the instruction.
Since the inst stayed on the worklist, as soon as it came back up to be
processed, bad things happened, and opt asserted."

llvm-svn: 2623
This commit is contained in:
Chris Lattner 2002-05-14 15:24:07 +00:00
parent 9e36792753
commit 053c0939e3
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
llvm/lib/Transforms/Scalar/InstructionCombining.cpp
View File

@ -26,6 +26,7 @@
#include "llvm/Support/InstIterator.h"
#include "llvm/Support/InstVisitor.h"
#include "Support/StatisticReporter.h"
#include <algorithm>
static Statistic<> NumCombined("instcombine\t- Number of insts combined");
@ -551,8 +552,18 @@ bool InstCombiner::runOnFunction(Function *F) {
if (Result) {
++NumCombined;
// Should we replace the old instruction with a new one?
if (Result != I)
if (Result != I) {
// Instructions can end up on the worklist more than once. Make sure
// we do not process an instruction that has been deleted.
std::vector<Instruction*>::iterator It = std::find(WorkList.begin(),
WorkList.end(), I);
while (It != WorkList.end()) {
It = WorkList.erase(It);
It = std::find(It, WorkList.end(), I);
}
ReplaceInstWithInst(I, Result);
}
WorkList.push_back(Result);
AddUsesToWorkList(Result);