6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-26 23:32:58 +00:00
Code Issues Projects Releases Wiki Activity

Only call getNodeForValue on pointer arguments! this fixes a problem running

Browse Source 
on Prolangs-C++/objects


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@17368 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2004-10-31 17:47:48 +00:00
parent 7d8d4711d9
commit 113cde8685
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Analysis/DataStructure/EquivClassGraphs.cpp
View File

@ -181,6 +181,7 @@ void PA::EquivClassGraphs::buildIndirectFunctionSets(Module &M) {
EqEnd = EqClass.end(); EqI != EqEnd; ++EqI) { EqEnd = EqClass.end(); EqI != EqEnd; ++EqI) {
Function* F = *EqI; Function* F = *EqI;
DSGraph*& FG = FoldedGraphsMap[F]; DSGraph*& FG = FoldedGraphsMap[F];
if (F == LF || FG == mergedG) if (F == LF || FG == mergedG)
continue; continue;
@ -194,6 +195,7 @@ void PA::EquivClassGraphs::buildIndirectFunctionSets(Module &M) {
GraphsMerged.insert(CBUGraph); GraphsMerged.insert(CBUGraph);
DSGraph::NodeMapTy NodeMap; DSGraph::NodeMapTy NodeMap;
mergedG->cloneInto(*CBUGraph, mergedG->getScalarMap(), mergedG->cloneInto(*CBUGraph, mergedG->getScalarMap(),
mergedG->getReturnNodes(), NodeMap, 0); mergedG->getReturnNodes(), NodeMap, 0);
@ -204,10 +206,14 @@ void PA::EquivClassGraphs::buildIndirectFunctionSets(Module &M) {
// If there are extra function args, add them to the vector of argNodes // If there are extra function args, add them to the vector of argNodes
Function::aiterator AI2 = F->abegin(), AI2end = F->aend(); Function::aiterator AI2 = F->abegin(), AI2end = F->aend();
for (unsigned arg=0, numArgs=GraphInfo.argNodes.size(); for (unsigned arg=0, numArgs=GraphInfo.argNodes.size();
arg < numArgs && AI2 != AI2end; ++AI2, ++arg) arg != numArgs && AI2 != AI2end; ++AI2, ++arg)
GraphInfo.argNodes[arg].mergeWith(mergedG->getNodeForValue(AI2)); if (DS::isPointerType(AI2->getType()))
GraphInfo.argNodes[arg].mergeWith(mergedG->getNodeForValue(AI2));
for ( ; AI2 != AI2end; ++AI2) for ( ; AI2 != AI2end; ++AI2)
GraphInfo.argNodes.push_back(mergedG->getNodeForValue(AI2)); if (DS::isPointerType(AI2->getType()))
GraphInfo.argNodes.push_back(mergedG->getNodeForValue(AI2));
DEBUG(mergedG->AssertGraphOK());
} }
} }
} }
@ -223,7 +229,6 @@ DSGraph &PA::EquivClassGraphs::getOrCreateGraph(Function &F) {
// Use the CBU graph directly without copying it. // Use the CBU graph directly without copying it.
// This automatically updates the FoldedGraphsMap via the reference. // This automatically updates the FoldedGraphsMap via the reference.
Graph = &CBU->getDSGraph(F); Graph = &CBU->getDSGraph(F);
return *Graph; return *Graph;
} }
@ -306,6 +311,7 @@ unsigned PA::EquivClassGraphs::processSCC(DSGraph &FG, Function& F,
FG.removeTriviallyDeadNodes(); FG.removeTriviallyDeadNodes();
Stack.pop_back(); Stack.pop_back();
processGraph(FG, F); processGraph(FG, F);
ValMap[&F] = ~0U; ValMap[&F] = ~0U;
return MyID; return MyID;
@ -319,7 +325,7 @@ void PA::EquivClassGraphs::processGraph(DSGraph &G, Function &F) {
hash_set<Instruction*> calls; hash_set<Instruction*> calls;
DSGraph* CallerGraph = sameAsCBUGraph(F)? NULL : &getOrCreateGraph(F); DSGraph* CallerGraph = sameAsCBUGraph(F) ? NULL : &getOrCreateGraph(F);
// If the function has not yet been cloned, let's check if any callees // If the function has not yet been cloned, let's check if any callees
// need to be inlined before cloning it. // need to be inlined before cloning it.