From 514934051a19b4a53782bc2914d6ae21c29758db Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Tue, 20 Apr 2004 20:20:59 +0000 Subject: [PATCH] Fix PR324 and testcase: Inline/2004-04-20-InlineLinkOnce.llx llvm-svn: 13080 --- llvm/lib/Transforms/IPO/Inliner.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/llvm/lib/Transforms/IPO/Inliner.cpp b/llvm/lib/Transforms/IPO/Inliner.cpp index 8633a7e950ff..0684c28697e4 100644 --- a/llvm/lib/Transforms/IPO/Inliner.cpp +++ b/llvm/lib/Transforms/IPO/Inliner.cpp @@ -120,14 +120,18 @@ bool Inliner::runOnSCC(const std::vector &SCC) { (Callee->hasInternalLinkage() || Callee->hasLinkOnceLinkage())) { DEBUG(std::cerr << " -> Deleting dead function: " << Callee->getName() << "\n"); - std::set::iterator I = SCCFunctions.find(Callee); - if (I != SCCFunctions.end()) // Remove function from this SCC. - SCCFunctions.erase(I); + SCCFunctions.erase(Callee); // Remove function from this SCC. // Remove any call graph edges from the callee to its callees. while (CalleeNode->begin() != CalleeNode->end()) CalleeNode->removeCallEdgeTo(*(CalleeNode->end()-1)); + // If the function has external linkage (basically if it's a + // linkonce function) remove the edge from the external node to the + // callee node. + if (!Callee->hasInternalLinkage()) + CG.getExternalCallingNode()->removeCallEdgeTo(CalleeNode); + // Removing the node for callee from the call graph and delete it. delete CG.removeFunctionFromModule(CalleeNode); ++NumDeleted;