diff options
| -rw-r--r-- | llvm/lib/LTO/LTO.cpp | 6 | ||||
| -rw-r--r-- | llvm/test/LTO/Resolution/X86/local-def-dllimport.ll | 32 |
2 files changed, 37 insertions, 1 deletions
diff --git a/llvm/lib/LTO/LTO.cpp b/llvm/lib/LTO/LTO.cpp index 08924fb92dd..f736ef8b7f9 100644 --- a/llvm/lib/LTO/LTO.cpp +++ b/llvm/lib/LTO/LTO.cpp @@ -693,8 +693,12 @@ LTO::addRegularLTO(BitcodeModule BM, ArrayRef<InputFile::Symbol> Syms, } // Set the 'local' flag based on the linker resolution for this symbol. - if (Res.FinalDefinitionInLinkageUnit) + if (Res.FinalDefinitionInLinkageUnit) { GV->setDSOLocal(true); + if (GV->hasDLLImportStorageClass()) + GV->setDLLStorageClass(GlobalValue::DLLStorageClassTypes:: + DefaultStorageClass); + } } // Common resolution: collect the maximum size/alignment over all commons. // We also record if we see an instance of a common as prevailing, so that diff --git a/llvm/test/LTO/Resolution/X86/local-def-dllimport.ll b/llvm/test/LTO/Resolution/X86/local-def-dllimport.ll new file mode 100644 index 00000000000..ddb78fbd9a6 --- /dev/null +++ b/llvm/test/LTO/Resolution/X86/local-def-dllimport.ll @@ -0,0 +1,32 @@ +; RUN: opt -thinlto-bc -o %t0.bc %s +; RUN: llvm-lto2 run -r %t0.bc,__imp_f,l \ +; RUN: -r %t0.bc,g,p \ +; RUN: -r %t0.bc,g,l \ +; RUN: -r %t0.bc,e,l \ +; RUN: -r %t0.bc,main,x \ +; RUN: -save-temps -o %t1 %t0.bc +; RUN: llvm-dis %t1.1.3.import.bc -o - | FileCheck %s +source_filename = "test.cpp" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-unknown-linux-gnu" + +$g = comdat any +@g = global i8 42, comdat, !type !0 + +; CHECK: define +; CHECK-NOT: dllimport +; CHECK-SAME: @f +define available_externally dllimport i8* @f() { + ret i8* @g +} + +define i8* @e() { + ret i8* @g +} + +define i32 @main() { + %1 = call i8* @f() + %2 = ptrtoint i8* %1 to i32 + ret i32 %2 +} +!0 = !{i32 0, !"typeid"} |
