instead of using a local RetValMap, just use the graph we are cloning into
for the return node map.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@20757 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/DataStructure/Steensgaard.cpp b/lib/Analysis/DataStructure/Steensgaard.cpp
index 45637ff..8c76189 100644
--- a/lib/Analysis/DataStructure/Steensgaard.cpp
+++ b/lib/Analysis/DataStructure/Steensgaard.cpp
@@ -119,18 +119,14 @@
ResultGraph->setGlobalsGraph(GlobalsGraph);
ResultGraph->setPrintAuxCalls();
- // RetValMap - Keep track of the return values for all functions that return
- // valid pointers.
- //
- DSGraph::ReturnNodesTy RetValMap;
-
// Loop over the rest of the module, merging graphs for non-external functions
// into this graph.
//
for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I)
if (!I->isExternal()) {
DSGraph::NodeMapTy NodeMap;
- ResultGraph->cloneInto(LDS.getDSGraph(*I), RetValMap, NodeMap, 0);
+ ResultGraph->cloneInto(LDS.getDSGraph(*I), ResultGraph->getReturnNodes(),
+ NodeMap, 0);
}
ResultGraph->removeTriviallyDeadNodes();
@@ -161,7 +157,7 @@
// If we can eliminate this function call, do so!
Function *F = CallTargets[c];
if (!F->isExternal()) {
- ResolveFunctionCall(F, CurCall, RetValMap[F]);
+ ResolveFunctionCall(F, CurCall, ResultGraph->getReturnNodes()[F]);
CallTargets[c] = CallTargets.back();
CallTargets.pop_back();
} else
@@ -174,7 +170,8 @@
}
}
- RetValMap.clear();
+ // Remove our knowledge of what the return values of the functions are.
+ ResultGraph->getReturnNodes().clear();
// Update the "incomplete" markers on the nodes, ignoring unknownness due to
// incoming arguments...