mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-01-08 03:30:22 +00:00
now that the second argument is always this->ReturnNodes, don't bother passing it.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@20758 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
560af8aa97
commit
d65145bd3d
@ -454,8 +454,7 @@ public:
|
||||
///
|
||||
/// The CloneFlags member controls various aspects of the cloning process.
|
||||
///
|
||||
void cloneInto(const DSGraph &G,
|
||||
ReturnNodesTy &OldReturnNodes, NodeMapTy &OldNodeMap,
|
||||
void cloneInto(const DSGraph &G, NodeMapTy &OldNodeMap,
|
||||
unsigned CloneFlags = 0);
|
||||
|
||||
/// getFunctionArgumentsForCall - Given a function that is currently in this
|
||||
|
@ -269,7 +269,7 @@ unsigned BUDataStructures::calculateGraphs(Function *F,
|
||||
if (&G != SCCGraph) {
|
||||
{
|
||||
DSGraph::NodeMapTy NodeMap;
|
||||
SCCGraph->cloneInto(G, SCCGraph->getReturnNodes(), NodeMap);
|
||||
SCCGraph->cloneInto(G, NodeMap);
|
||||
}
|
||||
// Update the DSInfo map and delete the old graph...
|
||||
for (DSGraph::retnodes_iterator I = G.retnodes_begin(),
|
||||
@ -413,7 +413,7 @@ void BUDataStructures::calculateGraph(DSGraph &Graph) {
|
||||
// bother merging it in again.
|
||||
if (!GI->containsFunction(*I)) {
|
||||
DSGraph::NodeMapTy NodeMap;
|
||||
GI->cloneInto(getDSGraph(**I), GI->getReturnNodes(), NodeMap);
|
||||
GI->cloneInto(getDSGraph(**I), NodeMap);
|
||||
++NumBUInlines;
|
||||
}
|
||||
|
||||
|
@ -175,8 +175,10 @@ unsigned CompleteBUDataStructures::calculateSCCGraphs(DSGraph &FG,
|
||||
DSGraph *NG = Stack.back();
|
||||
ValMap[NG] = ~0U;
|
||||
|
||||
DSGraph::NodeMapTy NodeMap;
|
||||
FG.cloneInto(*NG, FG.getReturnNodes(), NodeMap);
|
||||
{
|
||||
DSGraph::NodeMapTy NodeMap;
|
||||
FG.cloneInto(*NG, NodeMap);
|
||||
}
|
||||
|
||||
// Update the DSInfo map and delete the old graph...
|
||||
for (DSGraph::retnodes_iterator I = NG->retnodes_begin();
|
||||
|
@ -1169,14 +1169,14 @@ DSGraph::DSGraph(const DSGraph &G, EquivalenceClasses<GlobalValue*> &ECs,
|
||||
: GlobalsGraph(0), ScalarMap(ECs), TD(G.TD) {
|
||||
PrintAuxCalls = false;
|
||||
NodeMapTy NodeMap;
|
||||
cloneInto(G, ReturnNodes, NodeMap, CloneFlags);
|
||||
cloneInto(G, NodeMap, CloneFlags);
|
||||
}
|
||||
|
||||
DSGraph::DSGraph(const DSGraph &G, NodeMapTy &NodeMap,
|
||||
EquivalenceClasses<GlobalValue*> &ECs)
|
||||
: GlobalsGraph(0), ScalarMap(ECs), TD(G.TD) {
|
||||
PrintAuxCalls = false;
|
||||
cloneInto(G, ReturnNodes, NodeMap);
|
||||
cloneInto(G, NodeMap);
|
||||
}
|
||||
|
||||
DSGraph::~DSGraph() {
|
||||
@ -1242,8 +1242,7 @@ DSNode *DSGraph::addObjectToGraph(Value *Ptr, bool UseDeclaredType) {
|
||||
///
|
||||
/// The CloneFlags member controls various aspects of the cloning process.
|
||||
///
|
||||
void DSGraph::cloneInto(const DSGraph &G,
|
||||
ReturnNodesTy &OldReturnNodes, NodeMapTy &OldNodeMap,
|
||||
void DSGraph::cloneInto(const DSGraph &G, NodeMapTy &OldNodeMap,
|
||||
unsigned CloneFlags) {
|
||||
TIME_REGION(X, "cloneInto");
|
||||
assert(OldNodeMap.empty() && "Returned OldNodeMap should be empty!");
|
||||
@ -1306,9 +1305,9 @@ void DSGraph::cloneInto(const DSGraph &G,
|
||||
const DSNodeHandle &Ret = I->second;
|
||||
DSNodeHandle &MappedRet = OldNodeMap[Ret.getNode()];
|
||||
DSNode *MappedRetN = MappedRet.getNode();
|
||||
OldReturnNodes.insert(std::make_pair(I->first,
|
||||
DSNodeHandle(MappedRetN,
|
||||
MappedRet.getOffset()+Ret.getOffset())));
|
||||
ReturnNodes.insert(std::make_pair(I->first,
|
||||
DSNodeHandle(MappedRetN,
|
||||
MappedRet.getOffset()+Ret.getOffset())));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -271,7 +271,7 @@ void EquivClassGraphs::buildIndirectFunctionSets(Module &M) {
|
||||
|
||||
// Clone this member of the equivalence class into MergedG.
|
||||
DSGraph::NodeMapTy NodeMap;
|
||||
MergedG.cloneInto(CBUGraph, MergedG.getReturnNodes(), NodeMap, 0);
|
||||
MergedG.cloneInto(CBUGraph, NodeMap);
|
||||
}
|
||||
|
||||
// Merge the return nodes of all functions together.
|
||||
@ -362,8 +362,10 @@ processSCC(DSGraph &FG, std::vector<DSGraph*> &Stack, unsigned &NextID,
|
||||
|
||||
// If the SCC found is not the same as those found in CBU, make sure to
|
||||
// merge the graphs as appropriate.
|
||||
DSGraph::NodeMapTy NodeMap;
|
||||
FG.cloneInto(*NG, FG.getReturnNodes(), NodeMap);
|
||||
{
|
||||
DSGraph::NodeMapTy NodeMap;
|
||||
FG.cloneInto(*NG, NodeMap);
|
||||
}
|
||||
|
||||
// Update the DSInfo map and delete the old graph...
|
||||
for (DSGraph::retnodes_iterator I = NG->retnodes_begin();
|
||||
|
@ -125,8 +125,7 @@ bool Steens::runOnModule(Module &M) {
|
||||
for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I)
|
||||
if (!I->isExternal()) {
|
||||
DSGraph::NodeMapTy NodeMap;
|
||||
ResultGraph->cloneInto(LDS.getDSGraph(*I), ResultGraph->getReturnNodes(),
|
||||
NodeMap, 0);
|
||||
ResultGraph->cloneInto(LDS.getDSGraph(*I), NodeMap, 0);
|
||||
}
|
||||
|
||||
ResultGraph->removeTriviallyDeadNodes();
|
||||
|
Loading…
Reference in New Issue
Block a user