[lld] r374140 - [lld] Don't create hints-section if Hint/Name Table is empty

[Rui Ueyama via llvm-commits]

Author: ruiu
Date: Tue Oct  8 23:48:24 2019
New Revision: 374140

URL: http://llvm.org/viewvc/llvm-project?rev=374140&view=rev
Log:
[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

Added:
    lld/trunk/test/COFF/Inputs/ordinal-only-implib.def
    lld/trunk/test/COFF/imports-ordinal-only.s
Modified:
    lld/trunk/COFF/Writer.cpp

Modified: lld/trunk/COFF/Writer.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/Writer.cpp?rev=374140&r1=374139&r2=374140&view=diff
==============================================================================
--- lld/trunk/COFF/Writer.cpp (original)
+++ lld/trunk/COFF/Writer.cpp Tue Oct  8 23:48:24 2019
@@ -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);
 }
 

Added: lld/trunk/test/COFF/Inputs/ordinal-only-implib.def
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/Inputs/ordinal-only-implib.def?rev=374140&view=auto
==============================================================================
--- lld/trunk/test/COFF/Inputs/ordinal-only-implib.def (added)
+++ lld/trunk/test/COFF/Inputs/ordinal-only-implib.def Tue Oct  8 23:48:24 2019
@@ -0,0 +1,3 @@
+LIBRARY test.dll
+EXPORTS
+ByOrdinalFunction @ 1 NONAME

Added: lld/trunk/test/COFF/imports-ordinal-only.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/imports-ordinal-only.s?rev=374140&view=auto
==============================================================================
--- lld/trunk/test/COFF/imports-ordinal-only.s (added)
+++ lld/trunk/test/COFF/imports-ordinal-only.s Tue Oct  8 23:48:24 2019
@@ -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: