RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 03:33:20 +01:00
Code Issues Projects Releases Wiki Activity

available_externall linkage is not local, this was confusing the codegenerator,

Browse Source 
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
This commit is contained in:
Torok Edwin 2009-05-23 14:06:57 +00:00
parent 262a99ffed
commit beb86bd0b4
6 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/llvm/GlobalValue.h
View File

@ -123,8 +123,7 @@ public:
bool hasInternalLinkage() const { return Linkage == InternalLinkage; }
bool hasPrivateLinkage() const { return Linkage == PrivateLinkage; }
bool hasLocalLinkage() const {
return Linkage == InternalLinkage || Linkage == PrivateLinkage ||
Linkage == AvailableExternallyLinkage;
return Linkage == InternalLinkage || Linkage == PrivateLinkage;
}
bool hasDLLImportLinkage() const { return Linkage == DLLImportLinkage; }
bool hasDLLExportLinkage() const { return Linkage == DLLExportLinkage; }

4
lib/Transforms/IPO/GlobalDCE.cpp
View File

@ -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);
}

3
lib/Transforms/IPO/Inliner.cpp
View File

@ -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];

3
lib/Transforms/Utils/BasicInliner.cpp
View File

@ -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);

3
lib/Transforms/Utils/InlineCost.cpp
View File

@ -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

19
test/CodeGen/X86/2009-05-23-available_externally.ll Normal file
View File

@ -0,0 +1,19 @@
; RUN: llvm-as < %s | llc -relocation-model=pic | grep atoi | grep PLT
; PR4253
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
target triple = "x86_64-unknown-linux-gnu"
define i32 @foo(i8* %x) nounwind readonly {
entry:
%call = tail call fastcc i32 @atoi(i8* %x) nounwind readonly ; <i32> [#uses=1]
ret i32 %call
}
define available_externally fastcc i32 @atoi(i8* %__nptr) nounwind readonly {
entry:
%call = tail call i64 @strtol(i8* nocapture %__nptr, i8** null, i32 10) nounwind readonly ; <i64> [#uses=1]
%conv = trunc i64 %call to i32 ; <i32> [#uses=1]
ret i32 %conv
}
declare i64 @strtol(i8*, i8** nocapture, i32) nounwind