Value *LHS, *RHS;
ICmpInst::Predicate Op;
- Instruction *Context;
+ BasicBlock *ContextBB;
+ Instruction *ContextInst;
};
std::deque<Operation> WorkList;
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
//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);
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());
return;
}
+#ifndef NDEBUG
// Try to replace the whole instruction.
Value *V = IG->canonicalize(I, ET);
assert(V == I && "Late instruction canonicalization.");
DOUT << " into " << *I;
}
}
+#endif
DOUT << "push (%" << I->getParent()->getName() << ")\n";
Forwards visit(this, DT);