From: Evan Cheng Date: Wed, 2 Aug 2006 22:01:32 +0000 (+0000) Subject: Reflect change to AssignTopologicalOrder(). X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4876dc5b137a19039182bd4cfe2100917cbd468f;p=oota-llvm.git Reflect change to AssignTopologicalOrder(). git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29480 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Target/X86/X86ISelDAGToDAG.cpp b/lib/Target/X86/X86ISelDAGToDAG.cpp index 3896797724e..3239df9ca2c 100644 --- a/lib/Target/X86/X86ISelDAGToDAG.cpp +++ b/lib/Target/X86/X86ISelDAGToDAG.cpp @@ -271,12 +271,15 @@ void X86DAGToDAGISel::DetermineReachability(SDNode *f, SDNode *t) { if (N->getNumOperands() == 0) continue; - for (unsigned i2 = Orderf; ; ++i2) { + for (unsigned i2 = Range; ; ++i2) { SDNode *M = TopOrder[i2]; if (isReachable(M, N)) { // Update reachability from M to N's operands. - for (SDNode::op_iterator I = N->op_begin(), E = N->op_end(); I != E;++I) - setReachable(M, I->Val); + for (SDNode::op_iterator I = N->op_begin(),E = N->op_end(); I != E;++I){ + SDNode *P = I->Val; + if (P->getNodeId() >= 0) + setReachable(M, P); + } } if (M == N) break; } @@ -291,8 +294,7 @@ void X86DAGToDAGISel::InstructionSelectBasicBlock(SelectionDAG &DAG) { DEBUG(BB->dump()); MachineFunction::iterator FirstMBB = BB; - TopOrder = DAG.AssignTopologicalOrder(); - DAGSize = TopOrder.size(); + DAGSize = DAG.AssignTopologicalOrder(TopOrder); unsigned RMSize = (DAGSize * DAGSize + 7) / 8; ReachabilityMatrix = new unsigned char[RMSize]; memset(ReachabilityMatrix, 0, RMSize); @@ -318,6 +320,7 @@ void X86DAGToDAGISel::InstructionSelectBasicBlock(SelectionDAG &DAG) { ReachabilityMatrix = NULL; ReachMatrixRange = NULL; UnfoldableSet = NULL; + TopOrder.clear(); CodeGenMap.clear(); HandleMap.clear(); ReplaceMap.clear();