Uniformize capitalization of NodeId.

llvm-svn: 58386
This commit is contained in:
Duncan Sands 2008-10-29 17:52:12 +00:00
parent 4af91a146a
commit 4f4d9d24a4
2 changed files with 12 additions and 12 deletions

View File

@ -31,7 +31,7 @@ void DAGTypeLegalizer::run() {
// done. Set it to null to avoid confusion. // done. Set it to null to avoid confusion.
DAG.setRoot(SDValue()); DAG.setRoot(SDValue());
// Walk all nodes in the graph, assigning them a NodeID of 'ReadyToProcess' // Walk all nodes in the graph, assigning them a NodeId of 'ReadyToProcess'
// (and remembering them) if they are leaves and assigning 'NewNode' if // (and remembering them) if they are leaves and assigning 'NewNode' if
// non-leaves. // non-leaves.
for (SelectionDAG::allnodes_iterator I = DAG.allnodes_begin(), for (SelectionDAG::allnodes_iterator I = DAG.allnodes_begin(),
@ -140,25 +140,25 @@ NodeDone:
for (SDNode::use_iterator UI = N->use_begin(), E = N->use_end(); for (SDNode::use_iterator UI = N->use_begin(), E = N->use_end();
UI != E; ++UI) { UI != E; ++UI) {
SDNode *User = *UI; SDNode *User = *UI;
int NodeID = User->getNodeId(); int NodeId = User->getNodeId();
assert(NodeID != ReadyToProcess && NodeID != Processed && assert(NodeId != ReadyToProcess && NodeId != Processed &&
"Invalid node id for user of unprocessed node!"); "Invalid node id for user of unprocessed node!");
// This node has two options: it can either be a new node or its Node ID // This node has two options: it can either be a new node or its Node ID
// may be a count of the number of operands it has that are not ready. // may be a count of the number of operands it has that are not ready.
if (NodeID > 0) { if (NodeId > 0) {
User->setNodeId(NodeID-1); User->setNodeId(NodeId-1);
// If this was the last use it was waiting on, add it to the ready list. // If this was the last use it was waiting on, add it to the ready list.
if (NodeID-1 == ReadyToProcess) if (NodeId-1 == ReadyToProcess)
Worklist.push_back(User); Worklist.push_back(User);
continue; continue;
} }
// Otherwise, this node is new: this is the first operand of it that // Otherwise, this node is new: this is the first operand of it that
// became ready. Its new NodeID is the number of operands it has minus 1 // became ready. Its new NodeId is the number of operands it has minus 1
// (as this node is now processed). // (as this node is now processed).
assert(NodeID == NewNode && "Unknown node ID!"); assert(NodeId == NewNode && "Unknown node ID!");
User->setNodeId(User->getNumOperands()-1); User->setNodeId(User->getNumOperands()-1);
// If the node only has a single operand, it is now ready. // If the node only has a single operand, it is now ready.
@ -340,7 +340,7 @@ namespace {
/// ReplaceValueWith - The specified value was legalized to the specified other /// ReplaceValueWith - The specified value was legalized to the specified other
/// value. If they are different, update the DAG and NodeIDs replacing any uses /// value. If they are different, update the DAG and NodeIds replacing any uses
/// of From to use To instead. /// of From to use To instead.
void DAGTypeLegalizer::ReplaceValueWith(SDValue From, SDValue To) { void DAGTypeLegalizer::ReplaceValueWith(SDValue From, SDValue To) {
if (From == To) return; if (From == To) return;

View File

@ -35,9 +35,9 @@ class VISIBILITY_HIDDEN DAGTypeLegalizer {
TargetLowering &TLI; TargetLowering &TLI;
SelectionDAG &DAG; SelectionDAG &DAG;
public: public:
// NodeIDFlags - This pass uses the NodeID on the SDNodes to hold information // NodeIdFlags - This pass uses the NodeId on the SDNodes to hold information
// about the state of the node. The enum has all the values. // about the state of the node. The enum has all the values.
enum NodeIDFlags { enum NodeIdFlags {
/// ReadyToProcess - All operands have been processed, so this node is ready /// ReadyToProcess - All operands have been processed, so this node is ready
/// to be handled. /// to be handled.
ReadyToProcess = 0, ReadyToProcess = 0,
@ -153,7 +153,7 @@ public:
void run(); void run();
/// ReanalyzeNode - Recompute the NodeID and correct processed operands /// ReanalyzeNode - Recompute the NodeId and correct processed operands
/// for the specified node, adding it to the worklist if ready. /// for the specified node, adding it to the worklist if ready.
void ReanalyzeNode(SDNode *N) { void ReanalyzeNode(SDNode *N) {
N->setNodeId(NewNode); N->setNodeId(NewNode);