RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-12-04 01:11:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

"Default context" blocks can occur after a non-default one. This meant

Browse Source 
that properties were being applied where they didn't belong. Fixes crash
in new MiBench testcase.

Also mark debugging code as such in #ifdef.

llvm-svn: 33177
This commit is contained in:
Nick Lewycky 2007-01-13 02:05:28 +00:00
parent 40be764463
commit fa95bfe36f
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/Transforms/Scalar/PredicateSimplifier.cpp
View File

@ -721,7 +721,8 @@ namespace {
Value *LHS, *RHS;
ICmpInst::Predicate Op;
Instruction *Context;
BasicBlock *ContextBB;
Instruction *ContextInst;
};
std::deque<Operation> WorkList;
@ -1075,7 +1076,8 @@ namespace {
WorkList.push_back(Operation());
Operation &O = WorkList.back();
O.LHS = V1, O.RHS = V2, O.Op = Pred, O.Context = I;
O.LHS = V1, O.RHS = V2, O.Op = Pred, O.ContextInst = I;
O.ContextBB = I ? I->getParent() : TopBB;
}
/// defToOps - Given an instruction definition that we've learned something
@ -1306,10 +1308,10 @@ namespace {
//DOUT << "WorkList size: " << WorkList.size() << "\n";
Operation &O = WorkList.front();
if (O.Context) {
TopInst = O.Context;
Top = Forest->getNodeForBlock(TopInst->getParent());
}
TopInst = O.ContextInst;
TopBB = O.ContextBB;
Top = Forest->getNodeForBlock(TopBB);
O.LHS = IG.canonicalize(O.LHS, Top);
O.RHS = IG.canonicalize(O.RHS, Top);
@ -1317,8 +1319,8 @@ namespace {
assert(O.RHS == IG.canonicalize(O.RHS, Top) && "Canonicalize isn't.");
DOUT << "solving " << *O.LHS << " " << O.Op << " " << *O.RHS;
if (O.Context) DOUT << " context: " << *O.Context;
else DOUT << " default context";
if (O.ContextInst) DOUT << " context inst: " << *O.ContextInst;
else DOUT << " context block: " << O.ContextBB->getName();
DOUT << "\n";
DEBUG(IG.dump());
@ -1485,6 +1487,7 @@ namespace {
return;
}
#ifndef NDEBUG
// Try to replace the whole instruction.
Value *V = IG->canonicalize(I, ET);
assert(V == I && "Late instruction canonicalization.");
@ -1511,6 +1514,7 @@ namespace {
DOUT << " into " << *I;
}
}
#endif
DOUT << "push (%" << I->getParent()->getName() << ")\n";
Forwards visit(this, DT);