mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2026-04-26 12:20:42 +00:00
* Make the DSGraph cloner automatically merge global nodes
* BUClosure doesn't have to worry about global nodes * TDClosure now works with global nodes * Reenable DNE on TD pass, now that globals work right git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@4220 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -71,35 +71,6 @@ static void ResolveArguments(std::vector<DSNodeHandle> &Call, Function &F,
|
||||
}
|
||||
}
|
||||
|
||||
// MergeGlobalNodes - Merge all existing global nodes with globals
|
||||
// inlined from the callee or with globals from the GlobalsGraph.
|
||||
//
|
||||
static void MergeGlobalNodes(DSGraph &Graph,
|
||||
map<Value*, DSNodeHandle> &OldValMap) {
|
||||
map<Value*, DSNodeHandle> &ValMap = Graph.getValueMap();
|
||||
for (map<Value*, DSNodeHandle>::iterator I = ValMap.begin(), E = ValMap.end();
|
||||
I != E; ++I)
|
||||
if (GlobalValue *GV = dyn_cast<GlobalValue>(I->first)) {
|
||||
map<Value*, DSNodeHandle>::iterator NHI = OldValMap.find(GV);
|
||||
if (NHI != OldValMap.end()) // was it inlined from the callee?
|
||||
I->second.mergeWith(NHI->second);
|
||||
#if 0
|
||||
else // get it from the GlobalsGraph
|
||||
I->second.mergeWith(Graph.cloneGlobalInto(GV));
|
||||
#endif
|
||||
}
|
||||
|
||||
// Add unused inlined global nodes into the value map
|
||||
for (map<Value*, DSNodeHandle>::iterator I = OldValMap.begin(),
|
||||
E = OldValMap.end(); I != E; ++I)
|
||||
if (isa<GlobalValue>(I->first)) {
|
||||
DSNodeHandle &NH = ValMap[I->first]; // If global is not in ValMap...
|
||||
if (NH.getNode() == 0)
|
||||
NH = I->second; // Add the one just inlined.
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
DSGraph &BUDataStructures::calculateGraph(Function &F) {
|
||||
// Make sure this graph has not already been calculated, or that we don't get
|
||||
// into an infinite loop with mutually recursive functions.
|
||||
@@ -191,11 +162,6 @@ DSGraph &BUDataStructures::calculateGraph(Function &F) {
|
||||
if (Call[0].getNode()) // Handle the return value if present
|
||||
RetVal.mergeWith(Call[0]);
|
||||
|
||||
// Merge global value nodes in the inlined graph with the global
|
||||
// value nodes in the current graph if there are duplicates.
|
||||
//
|
||||
MergeGlobalNodes(*Graph, OldValMap);
|
||||
|
||||
// Erase the entry in the Callees vector
|
||||
Callees.erase(Callees.begin()+c--);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user