Skip to content

Commit b963c0b

Browse files
committed
[LTO] Handle __imp_ (dllimport) symbols consistently with lld
Summary: Similar to what lld already does for dllimport symbols which are prefaced with __imp_ (see lld patch r240620), strip off the __imp_ prefix in LTO. Otherwise we can get 2 separate GlobalResolution for a single symbol, the dllimport declaration, and the definition, which leads to incorrect LTO handling. Fixes PR38105. Reviewers: pcc Subscribers: mehdi_amini, inglorion, steven_wu, dexonsmith, llvm-commits Differential Revision: https://reviews.llvm.org/D49138 llvm-svn: 337762
1 parent fc3d72e commit b963c0b

File tree

3 files changed

+55
-1
lines changed

3 files changed

+55
-1
lines changed

llvm/lib/LTO/LTO.cpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,14 @@ void LTO::addModuleToGlobalRes(ArrayRef<InputFile::Symbol> Syms,
428428
assert(ResI != ResE);
429429
SymbolResolution Res = *ResI++;
430430

431-
auto &GlobalRes = GlobalResolutions[Sym.getName()];
431+
StringRef Name = Sym.getName();
432+
Triple TT(RegularLTO.CombinedModule->getTargetTriple());
433+
// Strip the __imp_ prefix from COFF dllimport symbols (similar to the
434+
// way they are handled by lld), otherwise we can end up with two
435+
// global resolutions (one with and one for a copy of the symbol without).
436+
if (TT.isOSBinFormatCOFF() && Name.startswith("__imp_"))
437+
Name = Name.substr(strlen("__imp_"));
438+
auto &GlobalRes = GlobalResolutions[Name];
432439
GlobalRes.UnnamedAddr &= Sym.isUnnamedAddr();
433440
if (Res.Prevailing) {
434441
assert(!GlobalRes.Prevailing &&

llvm/test/LTO/X86/Inputs/dllimport.ll

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
; ModuleID = 'b.obj'
2+
source_filename = "b.cpp"
3+
target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128"
4+
target triple = "x86_64-pc-windows-msvc19.11.0"
5+
6+
; Function Attrs: norecurse nounwind readnone sspstrong uwtable
7+
define dso_local i32 @"?foo@@YAHXZ"() local_unnamed_addr {
8+
entry:
9+
ret i32 42
10+
}
11+
12+
!llvm.module.flags = !{!1}
13+
14+
!1 = !{i32 1, !"ThinLTO", i32 0}
15+
16+
^0 = module: (path: "b.obj", hash: (0, 0, 0, 0, 0))
17+
^1 = gv: (name: "?foo@@YAHXZ", summaries: (function: (module: ^0, flags: (linkage: external, notEligibleToImport: 1, live: 0, dsoLocal: 1), insts: 1, funcFlags: (readNone: 1, readOnly: 0, noRecurse: 1, returnDoesNotAlias: 0)))) ; guid = 2709792123250749187

llvm/test/LTO/X86/dllimport.ll

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
; Test requiring LTO to remove the __imp_ prefix for locally imported COFF
2+
; symbols (mirroring how lld handles these symbols).
3+
; RUN: llvm-as %s -o %t.obj
4+
; RUN: llvm-as %S/Inputs/dllimport.ll -o %t2.obj
5+
; RUN: llvm-lto2 run -r=%t.obj,main,px -r %t.obj,__imp_?foo@@YAHXZ -r %t2.obj,?foo@@YAHXZ,p -o %t3 %t.obj %t2.obj -save-temps
6+
; RUN: llvm-dis %t3.0.0.preopt.bc -o - | FileCheck %s
7+
8+
; CHECK: define dso_local i32 @"?foo@@YAHXZ"()
9+
10+
; ModuleID = 'a.obj'
11+
source_filename = "a.cpp"
12+
target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128"
13+
target triple = "x86_64-pc-windows-msvc19.11.0"
14+
15+
; Function Attrs: norecurse nounwind sspstrong uwtable
16+
define dso_local i32 @main() local_unnamed_addr {
17+
entry:
18+
%call = tail call i32 @"?foo@@YAHXZ"()
19+
ret i32 %call
20+
}
21+
22+
declare dllimport i32 @"?foo@@YAHXZ"() local_unnamed_addr
23+
24+
!llvm.module.flags = !{!1}
25+
26+
!1 = !{i32 1, !"ThinLTO", i32 0}
27+
28+
^0 = module: (path: "a.obj", hash: (0, 0, 0, 0, 0))
29+
^1 = gv: (name: "?foo@@YAHXZ") ; guid = 2709792123250749187
30+
^2 = gv: (name: "main", summaries: (function: (module: ^0, flags: (linkage: external, notEligibleToImport: 1, live: 0, dsoLocal: 1), insts: 2, funcFlags: (readNone: 0, readOnly: 0, noRecurse: 1, returnDoesNotAlias: 0), calls: ((callee: ^1))))) ; guid = 15822663052811949562

0 commit comments

Comments
 (0)