Skip to content

Commit c3c5e0f

Browse files
committed
[lld] Don't create hints-section if Hint/Name Table is empty
Fixes assert in addLinkerModuleCoffGroup() when using by-ordinal imports only. Patch by Stefan Schmidt. Differential revision: https://reviews.llvm.org/D68352 llvm-svn: 374140
1 parent 4ac388f commit c3c5e0f

File tree

3 files changed

+23
-1
lines changed

3 files changed

+23
-1
lines changed

lld/COFF/Writer.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,8 @@ void Writer::addSyntheticIdata() {
743743
add(".idata$2", idata.dirs);
744744
add(".idata$4", idata.lookups);
745745
add(".idata$5", idata.addresses);
746-
add(".idata$6", idata.hints);
746+
if (!idata.hints.empty())
747+
add(".idata$6", idata.hints);
747748
add(".idata$7", idata.dllNames);
748749
}
749750

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
LIBRARY test.dll
2+
EXPORTS
3+
ByOrdinalFunction @ 1 NONAME

lld/test/COFF/imports-ordinal-only.s

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# REQUIRES: x86
2+
#
3+
# RUN: llvm-dlltool -k -m i386 --input-def %p/Inputs/ordinal-only-implib.def --output-lib %t-implib.a
4+
# RUN: llvm-mc -triple=i386-pc-win32 %s -filetype=obj -o %t.obj
5+
# RUN: lld-link -out:%t.exe -entry:main -subsystem:console -safeseh:no -debug %t.obj %t-implib.a
6+
# RUN: llvm-objdump -private-headers %t.exe | FileCheck --match-full-lines %s
7+
8+
.text
9+
.global _main
10+
_main:
11+
call _ByOrdinalFunction
12+
ret
13+
14+
# CHECK: The Import Tables:
15+
# CHECK: DLL Name: test.dll
16+
# CHECK-NEXT: Hint/Ord Name
17+
# CHECK-NEXT: 1
18+
# CHECK-EMPTY:

0 commit comments

Comments
 (0)