mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-19 04:29:21 +00:00
Eliminate self-recursion as a special case.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19979 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
af8650e9c7
commit
20cd136c5d
@ -313,41 +313,31 @@ void BUDataStructures::calculateGraph(DSGraph &Graph) {
|
|||||||
if (CalledFuncs.empty()) {
|
if (CalledFuncs.empty()) {
|
||||||
// Remember that we could not resolve this yet!
|
// Remember that we could not resolve this yet!
|
||||||
AuxCallsList.splice(AuxCallsList.end(), TempFCs, TempFCs.begin());
|
AuxCallsList.splice(AuxCallsList.end(), TempFCs, TempFCs.begin());
|
||||||
|
continue;
|
||||||
} else if (CalledFuncs.size() == 1) {
|
} else if (CalledFuncs.size() == 1) {
|
||||||
Function *Callee = *CalledFuncs.begin();
|
Function *Callee = *CalledFuncs.begin();
|
||||||
|
|
||||||
if (ReturnNodes.count(Callee)) {
|
ActualCallees.insert(std::make_pair(CS.getCallSite().getInstruction(),
|
||||||
// Self recursion... simply link up the formal arguments with the
|
Callee));
|
||||||
// actual arguments.
|
|
||||||
DEBUG(std::cerr << " Self Inlining: " << Callee->getName() << "\n");
|
|
||||||
|
|
||||||
// Handle self recursion by resolving the arguments and return value
|
|
||||||
Graph.mergeInGraph(CS, *Callee, Graph, 0);
|
|
||||||
} else {
|
|
||||||
ActualCallees.insert(std::make_pair(CS.getCallSite().getInstruction(),
|
|
||||||
Callee));
|
|
||||||
|
|
||||||
// Get the data structure graph for the called function.
|
|
||||||
//
|
|
||||||
DSGraph &GI = getDSGraph(*Callee); // Graph to inline
|
|
||||||
|
|
||||||
DEBUG(std::cerr << " Inlining graph for " << Callee->getName()
|
|
||||||
<< "[" << GI.getGraphSize() << "+"
|
|
||||||
<< GI.getAuxFunctionCalls().size() << "] into '"
|
|
||||||
<< Graph.getFunctionNames() << "' [" << Graph.getGraphSize() <<"+"
|
|
||||||
<< Graph.getAuxFunctionCalls().size() << "]\n");
|
|
||||||
Graph.mergeInGraph(CS, *Callee, GI,
|
|
||||||
DSGraph::KeepModRefBits |
|
|
||||||
DSGraph::StripAllocaBit|DSGraph::DontCloneCallNodes);
|
|
||||||
++NumBUInlines;
|
|
||||||
|
|
||||||
|
// Get the data structure graph for the called function.
|
||||||
|
//
|
||||||
|
DSGraph &GI = getDSGraph(*Callee); // Graph to inline
|
||||||
|
|
||||||
|
DEBUG(std::cerr << " Inlining graph for " << Callee->getName()
|
||||||
|
<< "[" << GI.getGraphSize() << "+"
|
||||||
|
<< GI.getAuxFunctionCalls().size() << "] into '"
|
||||||
|
<< Graph.getFunctionNames() << "' [" << Graph.getGraphSize() <<"+"
|
||||||
|
<< Graph.getAuxFunctionCalls().size() << "]\n");
|
||||||
|
Graph.mergeInGraph(CS, *Callee, GI,
|
||||||
|
DSGraph::KeepModRefBits |
|
||||||
|
DSGraph::StripAllocaBit|DSGraph::DontCloneCallNodes);
|
||||||
|
++NumBUInlines;
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
Graph.writeGraphToFile(std::cerr, "bu_" + F.getName() + "_after_" +
|
Graph.writeGraphToFile(std::cerr, "bu_" + F.getName() + "_after_" +
|
||||||
Callee->getName());
|
Callee->getName());
|
||||||
#endif
|
#endif
|
||||||
}
|
|
||||||
|
|
||||||
TempFCs.erase(TempFCs.begin());
|
|
||||||
} else {
|
} else {
|
||||||
if (!Printed)
|
if (!Printed)
|
||||||
std::cerr << "In Fns: " << Graph.getFunctionNames() << "\n";
|
std::cerr << "In Fns: " << Graph.getFunctionNames() << "\n";
|
||||||
@ -366,39 +356,30 @@ void BUDataStructures::calculateGraph(DSGraph &Graph) {
|
|||||||
for (std::set<Function*>::iterator I = CalledFuncs.begin(),
|
for (std::set<Function*>::iterator I = CalledFuncs.begin(),
|
||||||
E = CalledFuncs.end(); I != E; ++I) {
|
E = CalledFuncs.end(); I != E; ++I) {
|
||||||
Function *Callee = *I;
|
Function *Callee = *I;
|
||||||
if (ReturnNodes.count(Callee)) {
|
ActualCallees.insert(std::make_pair(CS.getCallSite().getInstruction(),
|
||||||
// Self recursion... simply link up the formal arguments with the
|
Callee));
|
||||||
// actual arguments.
|
|
||||||
DEBUG(std::cerr << " Self Inlining: " << Callee->getName() << "\n");
|
|
||||||
|
|
||||||
// Handle self recursion by resolving the arguments and return value
|
|
||||||
Graph.mergeInGraph(CS, *Callee, Graph, 0);
|
|
||||||
} else {
|
|
||||||
ActualCallees.insert(std::make_pair(CS.getCallSite().getInstruction(),
|
|
||||||
Callee));
|
|
||||||
|
|
||||||
// Get the data structure graph for the called function.
|
|
||||||
//
|
|
||||||
DSGraph &GI = getDSGraph(*Callee); // Graph to inline
|
|
||||||
|
|
||||||
DEBUG(std::cerr << " Inlining graph for " << Callee->getName()
|
|
||||||
<< "[" << GI.getGraphSize() << "+"
|
|
||||||
<< GI.getAuxFunctionCalls().size() << "] into '"
|
|
||||||
<< Graph.getFunctionNames() << "' [" << Graph.getGraphSize() <<"+"
|
|
||||||
<< Graph.getAuxFunctionCalls().size() << "]\n");
|
|
||||||
Graph.mergeInGraph(CS, *Callee, GI,
|
|
||||||
DSGraph::KeepModRefBits |
|
|
||||||
DSGraph::StripAllocaBit|DSGraph::DontCloneCallNodes);
|
|
||||||
++NumBUInlines;
|
|
||||||
|
|
||||||
|
// Get the data structure graph for the called function.
|
||||||
|
//
|
||||||
|
DSGraph &GI = getDSGraph(*Callee); // Graph to inline
|
||||||
|
|
||||||
|
DEBUG(std::cerr << " Inlining graph for " << Callee->getName()
|
||||||
|
<< "[" << GI.getGraphSize() << "+"
|
||||||
|
<< GI.getAuxFunctionCalls().size() << "] into '"
|
||||||
|
<< Graph.getFunctionNames() << "' [" << Graph.getGraphSize() <<"+"
|
||||||
|
<< Graph.getAuxFunctionCalls().size() << "]\n");
|
||||||
|
Graph.mergeInGraph(CS, *Callee, GI,
|
||||||
|
DSGraph::KeepModRefBits |
|
||||||
|
DSGraph::StripAllocaBit|DSGraph::DontCloneCallNodes);
|
||||||
|
++NumBUInlines;
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
Graph.writeGraphToFile(std::cerr, "bu_" + F.getName() + "_after_" +
|
Graph.writeGraphToFile(std::cerr, "bu_" + F.getName() + "_after_" +
|
||||||
Callee->getName());
|
Callee->getName());
|
||||||
#endif
|
#endif
|
||||||
}
|
|
||||||
}
|
}
|
||||||
TempFCs.erase(TempFCs.begin());
|
|
||||||
}
|
}
|
||||||
|
TempFCs.erase(TempFCs.begin());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Recompute the Incomplete markers
|
// Recompute the Incomplete markers
|
||||||
|
Loading…
Reference in New Issue
Block a user