[llvm-commits] [poolalloc] r58399 - /poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp

[Andrew Lenharth]

Author: alenhar2
Date: Wed Oct 29 17:05:18 2008
New Revision: 58399

URL: http://llvm.org/viewvc/llvm-project?rev=58399&view=rev
Log:
reenable this now that duplicate call elim is back in

Modified:
    poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp

Modified: poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp?rev=58399&r1=58398&r2=58399&view=diff

==============================================================================
--- poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp (original)
+++ poolalloc/trunk/lib/PoolAllocate/TransformFunctionBody.cpp Wed Oct 29 17:05:18 2008
@@ -615,8 +615,32 @@
       cast<Instruction>(getOldValueIfAvailable(CS.getInstruction()));
 
     DataStructures::callee_iterator I = Graphs.callee_begin(OrigInst);
-    assert (I != Graphs.callee_end(OrigInst) && "No call graph info");
-    CF = *I;
+    if (I != Graphs.callee_end(OrigInst))
+      CF = *I;
+    
+    // If we didn't find the callee in the constructed call graph, try
+    // checking in the DSNode itself.
+    // This isn't ideal as it means that this call site didn't have inlining
+    // happen.
+    if (!CF) {
+      DSGraph* dg = Graphs.getDSGraph(*OrigInst->getParent()->getParent());
+      DSNode* d = dg->getNodeForValue(OrigInst->getOperand(0)).getNode();
+      std::vector<const Function*> g;
+      d->addFullFunctionList(g);
+      if (g.size()) {
+        EquivalenceClasses< const GlobalValue *> & EC = dg->getGlobalECs();
+        for(std::vector<const Function*>::const_iterator ii = g.begin(), ee = g.end();
+            !CF && ii != ee; ++ii) {
+          for (EquivalenceClasses<const GlobalValue *>::member_iterator MI = EC.findLeader(*ii);
+               MI != EC.member_end(); ++MI)   // Loop over members in this set.
+            if ((CF = dyn_cast<Function>(*MI))) {
+              break;
+            }
+        }
+      }
+    }
+
+    assert (CF && "No call graph info");
 
     // Get the common graph for the set of functions this call may invoke.
     CalleeGraph = Graphs.getDSGraph(*CF);