Revert last patch which causes tblgen to segfault (why, I'm not sure).

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@31383 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer 2006-11-02 21:07:40 +00:00
parent 9bd6d65e29
commit 63fd6ad77b

View File

@ -2259,11 +2259,13 @@ public:
unsigned OpNo = 0; unsigned OpNo = 0;
bool NodeHasChain = NodeHasProperty (N, SDNPHasChain, ISE); bool NodeHasChain = NodeHasProperty (N, SDNPHasChain, ISE);
bool HasChain = PatternHasProperty(N, SDNPHasChain, ISE); bool HasChain = PatternHasProperty(N, SDNPHasChain, ISE);
bool HasOutFlag = PatternHasProperty(N, SDNPOutFlag, ISE);
bool EmittedUseCheck = false; bool EmittedUseCheck = false;
if (HasChain) { if (HasChain) {
if (NodeHasChain) if (NodeHasChain)
OpNo = 1; OpNo = 1;
if (!isRoot) { if (!isRoot) {
const SDNodeInfo &CInfo = ISE.getSDNodeInfo(N->getOperator());
// Multiple uses of actual result? // Multiple uses of actual result?
emitCheck(RootName + ".hasOneUse()"); emitCheck(RootName + ".hasOneUse()");
EmittedUseCheck = true; EmittedUseCheck = true;
@ -2327,6 +2329,7 @@ public:
(PatternHasProperty(N, SDNPInFlag, ISE) || (PatternHasProperty(N, SDNPInFlag, ISE) ||
PatternHasProperty(N, SDNPOptInFlag, ISE) || PatternHasProperty(N, SDNPOptInFlag, ISE) ||
PatternHasProperty(N, SDNPOutFlag, ISE))) { PatternHasProperty(N, SDNPOutFlag, ISE))) {
const SDNodeInfo &CInfo = ISE.getSDNodeInfo(N->getOperator());
if (!EmittedUseCheck) { if (!EmittedUseCheck) {
// Multiple uses of actual result? // Multiple uses of actual result?
emitCheck(RootName + ".hasOneUse()"); emitCheck(RootName + ".hasOneUse()");
@ -3315,9 +3318,10 @@ void DAGISelEmitter::EmitInstructionSelector(std::ostream &OS) {
PatternsByOpcode[Node->getOperator()].push_back(&PatternsToMatch[i]); PatternsByOpcode[Node->getOperator()].push_back(&PatternsToMatch[i]);
} else { } else {
const ComplexPattern *CP; const ComplexPattern *CP;
if (dynamic_cast<IntInit*>(Node->getLeafValue())) { if (IntInit *II =
dynamic_cast<IntInit*>(Node->getLeafValue())) {
PatternsByOpcode[getSDNodeNamed("imm")].push_back(&PatternsToMatch[i]); PatternsByOpcode[getSDNodeNamed("imm")].push_back(&PatternsToMatch[i]);
} else if (NodeGetComplexPattern(Node, *this)) { } else if ((CP = NodeGetComplexPattern(Node, *this))) {
std::vector<Record*> OpNodes = CP->getRootNodes(); std::vector<Record*> OpNodes = CP->getRootNodes();
for (unsigned j = 0, e = OpNodes.size(); j != e; j++) { for (unsigned j = 0, e = OpNodes.size(); j != e; j++) {
PatternsByOpcode[OpNodes[j]] PatternsByOpcode[OpNodes[j]]