From 7996339dd8d6485f23ccebddbc464cc912a84e2a Mon Sep 17 00:00:00 2001 From: Torok Edwin Date: Sat, 23 May 2009 14:06:57 +0000 Subject: available_externall linkage is not local, this was confusing the codegenerator, and it wasn't generating calls through @PLT for these functions. hasLocalLinkage() is now false for available_externally, I attempted to fix the inliner and dce to handle available_externally properly. It passed make check. llvm-svn: 72328 --- llvm/lib/Transforms/IPO/GlobalDCE.cpp | 4 ++-- llvm/lib/Transforms/IPO/Inliner.cpp | 3 ++- llvm/lib/Transforms/Utils/BasicInliner.cpp | 3 ++- llvm/lib/Transforms/Utils/InlineCost.cpp | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) (limited to 'llvm/lib') diff --git a/llvm/lib/Transforms/IPO/GlobalDCE.cpp b/llvm/lib/Transforms/IPO/GlobalDCE.cpp index 4f97ae175b1..db378b0d0b2 100644 --- a/llvm/lib/Transforms/IPO/GlobalDCE.cpp +++ b/llvm/lib/Transforms/IPO/GlobalDCE.cpp @@ -64,7 +64,7 @@ bool GlobalDCE::runOnModule(Module &M) { Changed |= RemoveUnusedGlobalValue(*I); // Functions with external linkage are needed if they have a body if (!I->hasLocalLinkage() && !I->hasLinkOnceLinkage() && - !I->isDeclaration()) + !I->isDeclaration() && !I->hasAvailableExternallyLinkage()) GlobalIsNeeded(I); } @@ -74,7 +74,7 @@ bool GlobalDCE::runOnModule(Module &M) { // Externally visible & appending globals are needed, if they have an // initializer. if (!I->hasLocalLinkage() && !I->hasLinkOnceLinkage() && - !I->isDeclaration()) + !I->isDeclaration() && !I->hasAvailableExternallyLinkage()) GlobalIsNeeded(I); } diff --git a/llvm/lib/Transforms/IPO/Inliner.cpp b/llvm/lib/Transforms/IPO/Inliner.cpp index b589792022a..b382837289b 100644 --- a/llvm/lib/Transforms/IPO/Inliner.cpp +++ b/llvm/lib/Transforms/IPO/Inliner.cpp @@ -69,7 +69,8 @@ bool Inliner::InlineCallIfPossible(CallSite CS, CallGraph &CG, // If we inlined the last possible call site to the function, delete the // function body now. - if (Callee->use_empty() && Callee->hasLocalLinkage() && + if (Callee->use_empty() && (Callee->hasLocalLinkage() || + Callee->hasAvailableExternallyLinkage()) && !SCCFunctions.count(Callee)) { DOUT << " -> Deleting dead function: " << Callee->getName() << "\n"; CallGraphNode *CalleeNode = CG[Callee]; diff --git a/llvm/lib/Transforms/Utils/BasicInliner.cpp b/llvm/lib/Transforms/Utils/BasicInliner.cpp index ef37614997c..1650cfa3065 100644 --- a/llvm/lib/Transforms/Utils/BasicInliner.cpp +++ b/llvm/lib/Transforms/Utils/BasicInliner.cpp @@ -130,7 +130,8 @@ void BasicInlinerImpl::inlineFunctions() { // Inline if (InlineFunction(CS, NULL, TD)) { - if (Callee->use_empty() && Callee->hasLocalLinkage()) + if (Callee->use_empty() && (Callee->hasLocalLinkage() || + Callee->hasAvailableExternallyLinkage())) DeadFunctions.insert(Callee); Changed = true; CallSites.erase(CallSites.begin() + index); diff --git a/llvm/lib/Transforms/Utils/InlineCost.cpp b/llvm/lib/Transforms/Utils/InlineCost.cpp index c9eb0ea1c90..87aff01a585 100644 --- a/llvm/lib/Transforms/Utils/InlineCost.cpp +++ b/llvm/lib/Transforms/Utils/InlineCost.cpp @@ -189,7 +189,8 @@ InlineCost InlineCostAnalyzer::getInlineCost(CallSite CS, // If there is only one call of the function, and it has internal linkage, // make it almost guaranteed to be inlined. // - if (Callee->hasLocalLinkage() && Callee->hasOneUse()) + if ((Callee->hasLocalLinkage() || Callee->hasAvailableExternallyLinkage()) && + Callee->hasOneUse()) InlineCost -= 15000; // If this function uses the coldcc calling convention, prefer not to inline -- cgit v1.2.3