averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[callgraph] Centralize the calling of destructors in the CallGraph of CallGraphState.

Browse Source 
Previously this was scattered in various places . Now we have a simple model that
all CallGraphEdges, CallGraphNodes, and CallGraphSCCs are owned by the CallGraph
since they are allocated by the CallGraph's BumpPtrAllocator.

This additionally fixes a problem where we were calling delete on SCC's owned by
the BumpPtrAllocator.

Swift SVN r25522
This commit is contained in:
Michael Gottesman
2015-02-25 00:41:14 +00:00
parent d24e5b785b
commit 0aee8f9521
2 changed files with 41 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/SILAnalysis/CallGraphAnalysis.cpp
View File

@@ -43,6 +43,23 @@ CallGraph::CallGraph(SILModule *Mod, bool completeModule) : M(*Mod) {
addEdges(&F);
}
CallGraph::~CallGraph() {
// Clean up all call graph nodes.
for (auto &P : FunctionToNodeMap) {
P.second->~CallGraphNode();
}
// Clean up all call graph edges.
for (auto &P : ApplyToEdgeMap) {
P.second->~CallGraphEdge();
}
// Clean up all SCCs.
for (CallGraphSCC *SCC : BottomUpSCCOrder) {
SCC->~CallGraphSCC();
}
}
void CallGraph::addCallGraphNode(SILFunction *F, unsigned NodeOrdinal) {
// TODO: Compute this from the call graph itself after stripping
// unreachable nodes from graph.
@@ -136,6 +153,8 @@ void CallGraph::addEdgesForApply(ApplyInst *AI, CallGraphNode *CallerNode) {
if (tryGetCalleeSet(AI->getCallee(), CalleeSet, Complete)) {
auto *Edge = new (Allocator) CallGraphEdge(AI, CalleeSet, Complete);
assert(!ApplyToEdgeMap.count(AI) &&
"Added apply that already has an edge node!\n");
ApplyToEdgeMap[AI] = Edge;
CallerNode->addCalleeEdge(Edge);
for (auto *CalleeNode : CalleeSet)
@@ -203,6 +222,8 @@ class CallGraphSCCFinder {
llvm::DenseMap<CallGraphNode *, unsigned> MinDFSNum;
llvm::SetVector<CallGraphNode *> DFSStack;
/// The CallGraphSCCFinder does not own this bump ptr allocator, so does not
/// call the destructor of objects allocated from it.
llvm::BumpPtrAllocator &BPA;
public:
@@ -257,8 +278,7 @@ public:
void CallGraph::computeBottomUpSCCOrder() {
if (!BottomUpSCCOrder.empty()) {
for (auto *SCC : BottomUpSCCOrder)
delete SCC;
SCC->~CallGraphSCC();
BottomUpSCCOrder.clear();
}
@@ -268,6 +288,7 @@ void CallGraph::computeBottomUpSCCOrder() {
}
void CallGraph::computeBottomUpFunctionOrder() {
// We do not need to call any destructors here.
BottomUpFunctionOrder.clear();
computeBottomUpSCCOrder();
@@ -277,6 +298,10 @@ void CallGraph::computeBottomUpFunctionOrder() {
BottomUpFunctionOrder.push_back(Node->getFunction());
}
//===----------------------------------------------------------------------===//
// CallGraph Verification
//===----------------------------------------------------------------------===//
void CallGraph::verify() const {
#ifndef NDEBUG
// For every function in the module, add it to our SILFunction set.