[PATCH] D65598: [LLD] [COFF] Avoid loading objects for mingw autoimport, when a defined alias exists

[Martin Storsjö via Phabricator via llvm-commits]

mstorsjo created this revision.
mstorsjo added reviewers: rnk, ruiu.
Herald added a project: LLVM.

This avoids a spurious and confusing log message in cases where both e.g. "alias" and "__imp_alias" exist.


Repository:
  rLLD LLVM Linker

https://reviews.llvm.org/D65598

Files:
  COFF/SymbolTable.cpp
  test/COFF/Inputs/alias-implib.lib
  test/COFF/alias-implib.s


Index: test/COFF/alias-implib.s
===================================================================
--- /dev/null
+++ test/COFF/alias-implib.s
@@ -0,0 +1,23 @@
+# REQUIRES: x86
+
+# RUN: llvm-mc -filetype=obj -triple=x86_64-mingw32 -o %t.o %s
+# RUN: lld-link -lldmingw -entry:main -out:%t.exe %t.o %S/Inputs/alias-implib.lib -verbose 2>&1 | FileCheck %s
+
+# Check that the undefined (weak) alias symbol (with an existing lazy
+# __imp_alias) doesn't trigger trying to load __imp_alias for autoimport,
+# when the weak alias target actually does exist.
+
+# CHECK-NOT: Loading lazy{{.*}}for automatic import
+
+    .text
+    .globl main
+main:
+    call alias
+    ret
+
+# alias-implib.lib was created with "llvm-dlltool -m i386:x86-64
+# -l alias-implib.lib -d alias-implib.def" with this def snippet:
+# LIBRARY lib.dll
+# EXPORTS
+# realfunc
+# alias == realfunc
Index: COFF/SymbolTable.cpp
===================================================================
--- COFF/SymbolTable.cpp
+++ COFF/SymbolTable.cpp
@@ -185,6 +185,8 @@
       continue;
     if (!sym->isUsedInRegularObj)
       continue;
+    if (undef->getWeakAlias())
+      continue;
 
     StringRef name = undef->getName();
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D65598.212876.patch
Type: text/x-patch
Size: 1197 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190801/dc129a68/attachment.bin>