diff options
| author | Dan Gohman <gohman@apple.com> | 2008-12-08 17:38:02 +0000 |
|---|---|---|
| committer | Dan Gohman <gohman@apple.com> | 2008-12-08 17:38:02 +0000 |
| commit | 64bc11e7ce9ec3b451e6b8b14bb919664db08f7f (patch) | |
| tree | becf950b15f40b99b216b8bae51655fb96785a94 /llvm/lib/Target/X86/X86Subtarget.cpp | |
| parent | f122ff0cad78a41bcae9c8d0d1e717a9fb3f1b80 (diff) | |
| download | bcm5719-llvm-64bc11e7ce9ec3b451e6b8b14bb919664db08f7f.tar.gz bcm5719-llvm-64bc11e7ce9ec3b451e6b8b14bb919664db08f7f.zip | |
Revert 60689. It caused many regressions on Darwin targets.
llvm-svn: 60705
Diffstat (limited to 'llvm/lib/Target/X86/X86Subtarget.cpp')
| -rw-r--r-- | llvm/lib/Target/X86/X86Subtarget.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/llvm/lib/Target/X86/X86Subtarget.cpp b/llvm/lib/Target/X86/X86Subtarget.cpp index c9d14d3d5d7..583fe8a0fbe 100644 --- a/llvm/lib/Target/X86/X86Subtarget.cpp +++ b/llvm/lib/Target/X86/X86Subtarget.cpp @@ -40,8 +40,6 @@ bool X86Subtarget::GVRequiresExtraLoad(const GlobalValue* GV, if (TM.getRelocationModel() != Reloc::Static && TM.getCodeModel() != CodeModel::Large) { if (isTargetDarwin()) { - if (!isDirectCall) - return false; bool isDecl = GV->isDeclaration() && !GV->hasNotBeenReadFromBitcode(); if (GV->hasHiddenVisibility() && (Is64Bit || (!isDecl && !GV->hasCommonLinkage()))) @@ -49,7 +47,7 @@ bool X86Subtarget::GVRequiresExtraLoad(const GlobalValue* GV, // target is x86-64 or the symbol is definitely defined in the current // translation unit. return false; - return isDecl || GV->mayBeOverridden(); + return !isDirectCall && (isDecl || GV->mayBeOverridden()); } else if (isTargetELF()) { // Extra load is needed for all externally visible. if (isDirectCall) |
