mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-03-01 01:30:36 +00:00
Fix a bug, don't drop indirect call sites, especially if there is nothing known about them yet, and restore a simple version of a removed function
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28857 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
ca0dc56742
commit
3770500f88
@ -938,7 +938,10 @@ void DSNode::mergeWith(const DSNodeHandle &NH, unsigned Offset) {
|
||||
// two node handles, since "this" may get merged away at intermediate steps.
|
||||
DSNodeHandle CurNodeH(this, Offset);
|
||||
DSNodeHandle NHCopy(NH);
|
||||
DSNode::MergeNodes(CurNodeH, NHCopy);
|
||||
if (CurNodeH.getOffset() >= NHCopy.getOffset())
|
||||
DSNode::MergeNodes(CurNodeH, NHCopy);
|
||||
else
|
||||
DSNode::MergeNodes(NHCopy, CurNodeH);
|
||||
}
|
||||
|
||||
|
||||
@ -1594,6 +1597,13 @@ void DSGraph::mergeInGraph(const DSCallSite &CS,
|
||||
for (afc_iterator I = Graph.afc_begin(), E = Graph.afc_end(); I!=E; ++I)
|
||||
if (SCCFinder.PathExistsToClonedNode(*I))
|
||||
AuxCallToCopy.push_back(&*I);
|
||||
else if (I->isIndirectCall()){
|
||||
//If the call node doesn't have any callees, clone it
|
||||
std::vector< Function *> List;
|
||||
I->getCalleeNode()->addFullFunctionList(List);
|
||||
if (!List.size())
|
||||
AuxCallToCopy.push_back(&*I);
|
||||
}
|
||||
|
||||
const DSScalarMap &GSM = Graph.getScalarMap();
|
||||
for (DSScalarMap::global_iterator GI = GSM.global_begin(),
|
||||
@ -2397,3 +2407,19 @@ void DSGraph::computeCalleeCallerMapping(DSCallSite CS, const Function &Callee,
|
||||
computeNodeMapping(CalleeSM[*GI], CallerSM[*GI], NodeMap);
|
||||
}
|
||||
}
|
||||
|
||||
/// updateFromGlobalGraph - This function rematerializes global nodes and
|
||||
/// nodes reachable from them from the globals graph into the current graph.
|
||||
///
|
||||
void DSGraph::updateFromGlobalGraph() {
|
||||
TIME_REGION(X, "updateFromGlobalGraph");
|
||||
ReachabilityCloner RC(*this, *GlobalsGraph, 0);
|
||||
|
||||
// Clone the non-up-to-date global nodes into this graph.
|
||||
for (DSScalarMap::global_iterator I = getScalarMap().global_begin(),
|
||||
E = getScalarMap().global_end(); I != E; ++I) {
|
||||
DSScalarMap::iterator It = GlobalsGraph->ScalarMap.find(*I);
|
||||
if (It != GlobalsGraph->ScalarMap.end())
|
||||
RC.merge(getNodeForValue(*I), It->second);
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user