Skip to content

Commit

Permalink
[lld] Don't create hints-section if Hint/Name Table is empty
Browse files Browse the repository at this point in the history
Fixes assert in addLinkerModuleCoffGroup() when using by-ordinal imports
only.

Patch by Stefan Schmidt.

Differential revision: https://reviews.llvm.org/D68352

llvm-svn: 374140
  • Loading branch information
rui314 committed Oct 9, 2019
1 parent 4ac388f commit c3c5e0f
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 1 deletion.
3 changes: 2 additions & 1 deletion lld/COFF/Writer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,8 @@ void Writer::addSyntheticIdata() {
add(".idata$2", idata.dirs);
add(".idata$4", idata.lookups);
add(".idata$5", idata.addresses);
add(".idata$6", idata.hints);
if (!idata.hints.empty())
add(".idata$6", idata.hints);
add(".idata$7", idata.dllNames);
}

Expand Down
3 changes: 3 additions & 0 deletions lld/test/COFF/Inputs/ordinal-only-implib.def
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
LIBRARY test.dll
EXPORTS
ByOrdinalFunction @ 1 NONAME
18 changes: 18 additions & 0 deletions lld/test/COFF/imports-ordinal-only.s
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# REQUIRES: x86
#
# RUN: llvm-dlltool -k -m i386 --input-def %p/Inputs/ordinal-only-implib.def --output-lib %t-implib.a
# RUN: llvm-mc -triple=i386-pc-win32 %s -filetype=obj -o %t.obj
# RUN: lld-link -out:%t.exe -entry:main -subsystem:console -safeseh:no -debug %t.obj %t-implib.a
# RUN: llvm-objdump -private-headers %t.exe | FileCheck --match-full-lines %s

.text
.global _main
_main:
call _ByOrdinalFunction
ret

# CHECK: The Import Tables:
# CHECK: DLL Name: test.dll
# CHECK-NEXT: Hint/Ord Name
# CHECK-NEXT: 1
# CHECK-EMPTY:

0 comments on commit c3c5e0f

Please sign in to comment.