* Remove the concept of a critical shadow node
* Make the function pointer argument explicit for a call nodes
* Eliminate unreachable global values
* Merge call nodes that are identical
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@2266 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/DataStructure/EliminateNodes.cpp b/lib/Analysis/DataStructure/EliminateNodes.cpp
index 6b22f69..edd8285 100644
--- a/lib/Analysis/DataStructure/EliminateNodes.cpp
+++ b/lib/Analysis/DataStructure/EliminateNodes.cpp
@@ -53,23 +53,6 @@
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;
}
@@ -80,9 +63,10 @@
//
static bool isIndistinguishableNode(DSNode *DN) {
if (DN->getReferrers().empty()) { // No referrers...
- if (isa<ShadowDSNode>(DN) || isa<AllocDSNode>(DN))
+ if (isa<ShadowDSNode>(DN) || isa<AllocDSNode>(DN)) {
+ delete DN;
return true; // Node is trivially dead
- else
+ } else
return false;
}
@@ -328,17 +312,30 @@
}
}
- // Loop over the global nodes, removing nodes that have no edges into them.
- //
+ // Loop over the global nodes, removing nodes that have no edges into them or
+ // out of them.
+ //
for (std::vector<GlobalDSNode*>::iterator I = GlobalNodes.begin();
I != GlobalNodes.end(); )
- if ((*I)->getReferrers().empty()) { // No referrers...
- delete *I;
- I = GlobalNodes.erase(I); // Remove the node...
- Changed = true;
+ if ((*I)->getReferrers().empty()) {
+ GlobalDSNode *GDN = *I;
+ bool NoLinks = true; // Make sure there are no outgoing links...
+ for (unsigned i = 0, e = GDN->getNumLinks(); i != e; ++i)
+ if (!GDN->getLink(i).empty()) {
+ NoLinks = false;
+ break;
+ }
+ if (NoLinks) {
+ delete GDN;
+ I = GlobalNodes.erase(I); // Remove the node...
+ Changed = true;
+ } else {
+ ++I;
+ }
} else {
++I;
}
+
return Changed;
}