Skip to content

Commit

Permalink
[COFF] don't mark lazy symbols as used in regular objects
Browse files Browse the repository at this point in the history
Summary:
r338767 updated the COFF and wasm linker SymbolTable code to be
strutured more like the ELF linker's. That inadvertedly changed the
behavior of the COFF linker so that lazy symbols would be marked as
used in regular objects. This change adds an overload of the insert()
function, similar to the ELF linker, which does not perform that
marking.

Reviewers: ruiu, rnk, hans

Subscribers: aheejin, sunfish, llvm-commits

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

llvm-svn: 341585
  • Loading branch information
inglorion committed Sep 6, 2018
1 parent e19ee29 commit 2ba4d23
Showing 3 changed files with 22 additions and 6 deletions.
13 changes: 9 additions & 4 deletions lld/COFF/SymbolTable.cpp
Original file line number Diff line number Diff line change
@@ -272,7 +272,7 @@ void SymbolTable::reportRemainingUndefines() {
}
}

std::pair<Symbol *, bool> SymbolTable::insert(StringRef Name, InputFile *File) {
std::pair<Symbol *, bool> SymbolTable::insert(StringRef Name) {
bool Inserted = false;
Symbol *&Sym = SymMap[CachedHashStringRef(Name)];
if (!Sym) {
@@ -281,11 +281,16 @@ std::pair<Symbol *, bool> SymbolTable::insert(StringRef Name, InputFile *File) {
Sym->PendingArchiveLoad = false;
Inserted = true;
}
if (!File || !isa<BitcodeFile>(File))
Sym->IsUsedInRegularObj = true;
return {Sym, Inserted};
}

std::pair<Symbol *, bool> SymbolTable::insert(StringRef Name, InputFile *File) {
std::pair<Symbol *, bool> Result = insert(Name);
if (!File || !isa<BitcodeFile>(File))
Result.first->IsUsedInRegularObj = true;
return Result;
}

Symbol *SymbolTable::addUndefined(StringRef Name, InputFile *F,
bool IsWeakAlias) {
Symbol *S;
@@ -308,7 +313,7 @@ void SymbolTable::addLazy(ArchiveFile *F, const Archive::Symbol Sym) {
StringRef Name = Sym.getName();
Symbol *S;
bool WasInserted;
std::tie(S, WasInserted) = insert(Name, nullptr);
std::tie(S, WasInserted) = insert(Name);
if (WasInserted) {
replaceSymbol<Lazy>(S, F, Sym);
return;
3 changes: 3 additions & 0 deletions lld/COFF/SymbolTable.h
Original file line number Diff line number Diff line change
@@ -111,6 +111,9 @@ class SymbolTable {
}

private:
/// Inserts symbol if not already present.
std::pair<Symbol *, bool> insert(StringRef Name);
/// Same as insert(Name), but also sets IsUsedInRegularObj.
std::pair<Symbol *, bool> insert(StringRef Name, InputFile *F);
StringRef findByPrefix(StringRef Prefix);

12 changes: 10 additions & 2 deletions lld/test/COFF/thinlto-archives.ll
Original file line number Diff line number Diff line change
@@ -6,9 +6,17 @@
; RUN: opt -thinlto-bc -o %T/thinlto-archives/b/bar.obj %S/Inputs/bar.ll
; RUN: llvm-ar crs %T/thinlto-archives/a.lib %T/thinlto-archives/a/bar.obj
; RUN: llvm-ar crs %T/thinlto-archives/b.lib %T/thinlto-archives/b/bar.obj
; RUN: lld-link /out:%T/thinlto-archives/main.exe -entry:main \
; RUN: -subsystem:console %T/thinlto-archives/main.obj \
; RUN: lld-link -out:%T/thinlto-archives/main.exe -entry:main \
; RUN: -lldsavetemps -subsystem:console %T/thinlto-archives/main.obj \
; RUN: %T/thinlto-archives/a.lib %T/thinlto-archives/b.lib
; RUN: FileCheck %s < %T/thinlto-archives/main.exe.resolution.txt

; CHECK: {{/thinlto-archives/main.obj$}}
; CHECK: {{^-r=.*/thinlto-archives/main.obj,main,px$}}
; CHECK: {{/thinlto-archives/a.libbar.obj$}}
; CHECK-NEXT: {{^-r=.*/thinlto-archives/a.libbar.obj,foo,p$}}
; CHECK-NEXT: {{/thinlto-archives/b.libbar.obj$}}
; CHECK-NEXT: {{^-r=.*/thinlto-archives/b.libbar.obj,bar,p$}}

target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-pc-windows-msvc"

0 comments on commit 2ba4d23

Please sign in to comment.