Allow merging of identical call nodes. Make the shadow node pointed to
by the call node noncritical before the call is destroyed.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@2082 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/DataStructure/EliminateNodes.cpp b/lib/Analysis/DataStructure/EliminateNodes.cpp
index 7dd5b33..767f7fe 100644
--- a/lib/Analysis/DataStructure/EliminateNodes.cpp
+++ b/lib/Analysis/DataStructure/EliminateNodes.cpp
@@ -53,6 +53,23 @@
assert(RanOnce && "Node on user set but cannot find the use!");
}
+ // If we are about to eliminate a call node that returns a pointer, make the
+ // shadow node it points to not be critical anymore!
+ //
+ if (isa<CallDSNode>(N1) && N1->getNumLinks()) {
+ assert(N1->getNumLinks() == 1 && "Call node can only return one pointer!");
+ PointerValSet &PVS = N1->getLink(0);
+
+ for (unsigned i = 0, e = PVS.size(); i != e; ++i)
+ if (ShadowDSNode *Shad = dyn_cast<ShadowDSNode>(PVS[i].Node))
+ if (Shad->isCriticalNode()) {
+ Shad->resetCriticalMark(); // Only unmark _ONE_ node..
+ break;
+ }
+
+ }
+
+
N1->removeAllIncomingEdges();
delete N1;
}
@@ -170,10 +187,7 @@
return
removeIndistinguishableNodes(AllocNodes) |
removeIndistinguishableNodes(ShadowNodes) |
- //FIXME: We cannot naively remove call nodes here because if there is a
- // shadow node that is the result of the call, we have to make sure to
- // merge the shadow node as well!!!
- // removeIndistinguishableNodePairs(CallNodes) |
+ removeIndistinguishableNodePairs(CallNodes) |
removeIndistinguishableNodePairs(GlobalNodes);
}