From 1da1d32fc742db98a0850164177920f15b998b67 Mon Sep 17 00:00:00 2001 From: "Vikram S. Adve" Date: Wed, 16 Jul 2003 21:42:03 +0000 Subject: [PATCH] Rematerialize nodes from the globals graph into the current graph after all callees are inlined into the current graph. NOTE: There's also a major bug fix for the BU pass in DataStructure.cpp, which ensures that resolvable indirect calls are not moved out to the globals graph, so that they are eventually inlined (if possible). git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@7189 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Analysis/DataStructure/BottomUpClosure.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/Analysis/DataStructure/BottomUpClosure.cpp b/lib/Analysis/DataStructure/BottomUpClosure.cpp index 94d0512fd25..aff74ac9206 100644 --- a/lib/Analysis/DataStructure/BottomUpClosure.cpp +++ b/lib/Analysis/DataStructure/BottomUpClosure.cpp @@ -283,11 +283,17 @@ void BUDataStructures::calculateGraph(DSGraph &Graph) { TempFCs.clear(); - // Recompute the Incomplete markers. If there are any function calls left - // now that are complete, we must loop! + // Re-materialize nodes from the globals graph. + // Do not ignore globals inlined from callees -- they are not up-to-date! + Graph.getInlinedGlobals().clear(); + Graph.updateFromGlobalGraph(); + + // Recompute the Incomplete markers Graph.maskIncompleteMarkers(); Graph.markIncompleteNodes(DSGraph::MarkFormalArgs); - // FIXME: materialize nodes from the globals graph as neccesary... + + // Delete dead nodes. Treat globals that are unreachable but that can + // reach live nodes as live. Graph.removeDeadNodes(DSGraph::KeepUnreachableGlobals); //Graph.writeGraphToFile(std::cerr, "bu_" + F.getName()); -- 2.34.1