Skip to content

Commit

Permalink
getNodes() is gone
Browse files Browse the repository at this point in the history 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@11166 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
@lattner
lattner committed Feb 7, 2004
1 parent e187d56 commit a84c681
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 42 deletions.
42 changes: 21 additions & 21 deletions lib/Analysis/DataStructure/IPModRef.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,10 @@ FunctionModRefInfo::FunctionModRefInfo(const Function& func,
funcTDGraph(tdgClone),
funcModRefInfo(tdgClone->getGraphSize())
{
for (unsigned i=0, N = funcTDGraph->getGraphSize(); i < N; ++i)
NodeIds[funcTDGraph->getNodes()[i]] = i;
unsigned i = 0;
for (DSGraph::node_iterator NI = funcTDGraph->node_begin(),
E = funcTDGraph->node_end(); NI != E; ++NI)
NodeIds[*NI] = i++;
}


Expand Down Expand Up @@ -95,13 +97,12 @@ void FunctionModRefInfo::computeModRef(const Function &func)
{
// Mark all nodes in the graph that are marked MOD as being mod
// and all those marked REF as being ref.
for (unsigned i = 0, N = funcTDGraph->getGraphSize(); i < N; ++i)
{
if (funcTDGraph->getNodes()[i]->isModified())
funcModRefInfo.setNodeIsMod(i);
if (funcTDGraph->getNodes()[i]->isRead())
funcModRefInfo.setNodeIsRef(i);
}
unsigned i = 0;
for (DSGraph::node_iterator NI = funcTDGraph->node_begin(),
E = funcTDGraph->node_end(); NI != E; ++NI, ++i) {
if ((*NI)->isModified()) funcModRefInfo.setNodeIsMod(i);
if ((*NI)->isRead()) funcModRefInfo.setNodeIsRef(i);
}

// Compute the Mod/Ref info for all call sites within the function.
// The call sites are recorded in the TD graph.
Expand Down Expand Up @@ -214,18 +215,15 @@ FunctionModRefInfo::computeModRef(CallSite CS)
}

// For all nodes in the graph, extract the mod/ref information
const std::vector<DSNode*>& csgNodes = csgp->getNodes();
const std::vector<DSNode*>& origNodes = funcTDGraph->getNodes();
assert(csgNodes.size() == origNodes.size());
for (unsigned i=0, N = origNodes.size(); i < N; ++i)
{
DSNode* csgNode = NodeMap[origNodes[i]].getNode();
assert(csgNode && "Inlined and original graphs do not correspond!");
if (csgNode->isModified())
callModRefInfo->setNodeIsMod(getNodeId(origNodes[i]));
if (csgNode->isRead())
callModRefInfo->setNodeIsRef(getNodeId(origNodes[i]));
}
for (DSGraph::node_iterator NI = funcTDGraph->node_begin(),
E = funcTDGraph->node_end(); NI != E; ++NI) {
DSNode* csgNode = NodeMap[*NI].getNode();
assert(csgNode && "Inlined and original graphs do not correspond!");
if (csgNode->isModified())
callModRefInfo->setNodeIsMod(getNodeId(*NI));
if (csgNode->isRead())
callModRefInfo->setNodeIsRef(getNodeId(*NI));
}

// Drop nodemap before we delete the graph...
NodeMap.clear();
Expand Down Expand Up @@ -295,8 +293,10 @@ class DSGraphPrintHelper {

O << std::string((j < NV-1)? "; " : "\n");
}
#if 0
else
tdGraph.getNodes()[i]->print(O, /*graph*/ NULL);
#endif
}
}
};
Expand Down
42 changes: 21 additions & 21 deletions lib/Analysis/IPA/IPModRef.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,10 @@ FunctionModRefInfo::FunctionModRefInfo(const Function& func,
funcTDGraph(tdgClone),
funcModRefInfo(tdgClone->getGraphSize())
{
for (unsigned i=0, N = funcTDGraph->getGraphSize(); i < N; ++i)
NodeIds[funcTDGraph->getNodes()[i]] = i;
unsigned i = 0;
for (DSGraph::node_iterator NI = funcTDGraph->node_begin(),
E = funcTDGraph->node_end(); NI != E; ++NI)
NodeIds[*NI] = i++;
}


Expand Down Expand Up @@ -95,13 +97,12 @@ void FunctionModRefInfo::computeModRef(const Function &func)
{
// Mark all nodes in the graph that are marked MOD as being mod
// and all those marked REF as being ref.
for (unsigned i = 0, N = funcTDGraph->getGraphSize(); i < N; ++i)
{
if (funcTDGraph->getNodes()[i]->isModified())
funcModRefInfo.setNodeIsMod(i);
if (funcTDGraph->getNodes()[i]->isRead())
funcModRefInfo.setNodeIsRef(i);
}
unsigned i = 0;
for (DSGraph::node_iterator NI = funcTDGraph->node_begin(),
E = funcTDGraph->node_end(); NI != E; ++NI, ++i) {
if ((*NI)->isModified()) funcModRefInfo.setNodeIsMod(i);
if ((*NI)->isRead()) funcModRefInfo.setNodeIsRef(i);
}

// Compute the Mod/Ref info for all call sites within the function.
// The call sites are recorded in the TD graph.
Expand Down Expand Up @@ -214,18 +215,15 @@ FunctionModRefInfo::computeModRef(CallSite CS)
}

// For all nodes in the graph, extract the mod/ref information
const std::vector<DSNode*>& csgNodes = csgp->getNodes();
const std::vector<DSNode*>& origNodes = funcTDGraph->getNodes();
assert(csgNodes.size() == origNodes.size());
for (unsigned i=0, N = origNodes.size(); i < N; ++i)
{
DSNode* csgNode = NodeMap[origNodes[i]].getNode();
assert(csgNode && "Inlined and original graphs do not correspond!");
if (csgNode->isModified())
callModRefInfo->setNodeIsMod(getNodeId(origNodes[i]));
if (csgNode->isRead())
callModRefInfo->setNodeIsRef(getNodeId(origNodes[i]));
}
for (DSGraph::node_iterator NI = funcTDGraph->node_begin(),
E = funcTDGraph->node_end(); NI != E; ++NI) {
DSNode* csgNode = NodeMap[*NI].getNode();
assert(csgNode && "Inlined and original graphs do not correspond!");
if (csgNode->isModified())
callModRefInfo->setNodeIsMod(getNodeId(*NI));
if (csgNode->isRead())
callModRefInfo->setNodeIsRef(getNodeId(*NI));
}

// Drop nodemap before we delete the graph...
NodeMap.clear();
Expand Down Expand Up @@ -295,8 +293,10 @@ class DSGraphPrintHelper {

O << std::string((j < NV-1)? "; " : "\n");
}
#if 0
else
tdGraph.getNodes()[i]->print(O, /*graph*/ NULL);
#endif
}
}
};
Expand Down

0 comments on commit a84c681

Please sign in to comment.