[lld] r355577 - [WebAssembly] LTO: Don't include bitcode-only symbols in the symtab

[Sam Clegg via llvm-commits]

Author: sbc
Date: Wed Mar  6 18:43:19 2019
New Revision: 355577

URL: http://llvm.org/viewvc/llvm-project?rev=355577&view=rev
Log:
[WebAssembly] LTO: Don't include bitcode-only symbols in the symtab

Fixes https://bugs.llvm.org/show_bug.cgi?id=40654

Differential Revision: https://reviews.llvm.org/D59012

Added:
    lld/trunk/test/wasm/lto/relocatable.ll
Modified:
    lld/trunk/test/ELF/lto/relocatable.ll
    lld/trunk/wasm/Writer.cpp

Modified: lld/trunk/test/ELF/lto/relocatable.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/relocatable.ll?rev=355577&r1=355576&r2=355577&view=diff
==============================================================================
--- lld/trunk/test/ELF/lto/relocatable.ll (original)
+++ lld/trunk/test/ELF/lto/relocatable.ll Wed Mar  6 18:43:19 2019
@@ -71,3 +71,5 @@ define void @foo() {
 define internal void @bar() {
   ret void
 }
+
+declare i32 @baz(...)

Added: lld/trunk/test/wasm/lto/relocatable.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/wasm/lto/relocatable.ll?rev=355577&view=auto
==============================================================================
--- lld/trunk/test/wasm/lto/relocatable.ll (added)
+++ lld/trunk/test/wasm/lto/relocatable.ll Wed Mar  6 18:43:19 2019
@@ -0,0 +1,27 @@
+; RUN: llvm-as %s -o %t1.o
+; RUN: wasm-ld %t1.o -r -o %t
+; RUN: llvm-readobj -symbols %t | FileCheck %s
+
+; CHECK:      Symbols [
+; CHECK-NEXT:   Symbol {
+; CHECK-NEXT:     Name: foo
+; CHECK-NEXT:     Type: FUNCTION (0x0)
+; CHECK-NEXT:     Flags [ (0x0)
+; CHECK-NEXT:     ]
+; CHECK-NEXT:     ElementIndex: 0x0
+; CHECK-NEXT:   }
+; CHECK-NEXT: ]
+
+target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
+target triple = "wasm32-unknown-unknown"
+
+define void @foo() {
+  call void @bar()
+  ret void
+}
+
+define internal void @bar() {
+  ret void
+}
+
+declare i32 @baz(...)

Modified: lld/trunk/wasm/Writer.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/wasm/Writer.cpp?rev=355577&r1=355576&r2=355577&view=diff
==============================================================================
--- lld/trunk/wasm/Writer.cpp (original)
+++ lld/trunk/wasm/Writer.cpp Wed Mar  6 18:43:19 2019
@@ -950,7 +950,7 @@ void Writer::assignSymtab() {
   };
 
   for (Symbol *Sym : Symtab->getSymbols())
-    if (!Sym->isLazy())
+    if (Sym->IsUsedInRegularObj)
       AddSymbol(Sym);
 
   for (ObjFile *File : Symtab->ObjectFiles) {