[lld] r365553 - [lld][WebAssembly] Report undefined symbols during scanRelocations
Sam Clegg via llvm-commits
llvm-commits at lists.llvm.org
Tue Jul 9 13:45:21 PDT 2019
Author: sbc
Date: Tue Jul 9 13:45:20 2019
New Revision: 365553
URL: http://llvm.org/viewvc/llvm-project?rev=365553&view=rev
Log:
[lld][WebAssembly] Report undefined symbols during scanRelocations
This puts handling of undefined symbols in a single location. Its
also more in line with the ELF backend which only reports undefined
symbols based on relocations.
One side effect is that we no longer report undefined symbols that are
only referenced in GC'd sections.
This also fixes a crash reported in the emscripten toolchain:
https://github.com/emscripten-core/emscripten/issues/8930.
Differential Revision: https://reviews.llvm.org/D64280
Modified:
lld/trunk/test/wasm/undefined-data.ll
lld/trunk/test/wasm/undefined.ll
lld/trunk/wasm/InputFiles.cpp
lld/trunk/wasm/Relocations.cpp
lld/trunk/wasm/SymbolTable.cpp
lld/trunk/wasm/SymbolTable.h
lld/trunk/wasm/Writer.cpp
Modified: lld/trunk/test/wasm/undefined-data.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/wasm/undefined-data.ll?rev=365553&r1=365552&r2=365553&view=diff
==============================================================================
--- lld/trunk/test/wasm/undefined-data.ll (original)
+++ lld/trunk/test/wasm/undefined-data.ll Tue Jul 9 13:45:20 2019
@@ -1,6 +1,6 @@
; RUN: llc -filetype=obj %s -o %t.o
; RUN: not wasm-ld -o %t.wasm %t.o 2>&1 | FileCheck %s -check-prefix=UNDEF
-; RUN: not wasm-ld --allow-undefined -o %t.wasm %t.o 2>&1 | FileCheck %s -check-prefix=ALLOW
+; RUN: not wasm-ld --allow-undefined -o %t.wasm %t.o 2>&1 | FileCheck %s -check-prefix=UNDEF
; RUN: not wasm-ld --shared -o %t.wasm %t.o 2>&1 | FileCheck %s -check-prefix=SHARED
target triple = "wasm32-unknown-unknown"
@@ -14,5 +14,4 @@ entry:
}
; UNDEF: error: {{.*}}undefined-data.ll.tmp.o: undefined symbol: data_external
-; ALLOW: error: {{.*}}undefined-data.ll.tmp.o: cannot resolve relocation of type R_WASM_MEMORY_ADDR_LEB against undefined (non-weak) data symbol: data_external
; SHARED: error: {{.*}}undefined-data.ll.tmp.o: relocation R_WASM_MEMORY_ADDR_LEB cannot be used against symbol data_external; recompile with -fPIC
Modified: lld/trunk/test/wasm/undefined.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/wasm/undefined.ll?rev=365553&r1=365552&r2=365553&view=diff
==============================================================================
--- lld/trunk/test/wasm/undefined.ll (original)
+++ lld/trunk/test/wasm/undefined.ll Tue Jul 9 13:45:20 2019
@@ -1,7 +1,7 @@
; RUN: llc -filetype=obj %s -o %t.o
; RUN: wasm-ld --allow-undefined -o %t.wasm %t.o
-; Fails due to undefined 'foo'
+; Fails due to undefined 'foo'
; RUN: not wasm-ld --undefined=baz -o %t.wasm %t.o 2>&1 | FileCheck %s
; CHECK: error: {{.*}}.o: undefined symbol: foo
; CHECK-NOT: undefined symbol: baz
@@ -16,7 +16,8 @@
target triple = "wasm32-unknown-unknown"
; Takes the address of the external foo() resulting in undefined external
- at bar = hidden local_unnamed_addr global i8* bitcast (i32 ()* @foo to i8*), align 4
+ at bar = global i8* bitcast (i32 ()* @foo to i8*), align 4
+ at llvm.used = appending global [1 x i8**] [i8** @bar], section "llvm.metadata"
declare i32 @foo() #0
Modified: lld/trunk/wasm/InputFiles.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/wasm/InputFiles.cpp?rev=365553&r1=365552&r2=365553&view=diff
==============================================================================
--- lld/trunk/wasm/InputFiles.cpp (original)
+++ lld/trunk/wasm/InputFiles.cpp Tue Jul 9 13:45:20 2019
@@ -160,22 +160,6 @@ uint32_t ObjFile::calcNewValue(const Was
// in debug sections.
if ((isa<FunctionSymbol>(Sym) || isa<DataSymbol>(Sym)) && !Sym->isLive())
return 0;
-
- // Special handling for undefined data symbols. Most relocations against
- // such symbols cannot be resolved.
- if (isa<DataSymbol>(Sym) && Sym->isUndefined()) {
- if (Sym->isWeak() || Config->Relocatable)
- return 0;
- // R_WASM_MEMORY_ADDR_I32 relocations in PIC code are turned into runtime
- // fixups in __wasm_apply_relocs
- if (Config->Pic && Reloc.Type == R_WASM_MEMORY_ADDR_I32)
- return 0;
- if (Reloc.Type != R_WASM_GLOBAL_INDEX_LEB) {
- llvm_unreachable(
- ("invalid relocation against undefined data symbol: " + toString(*Sym))
- .c_str());
- }
- }
}
switch (Reloc.Type) {
@@ -189,6 +173,8 @@ uint32_t ObjFile::calcNewValue(const Was
case R_WASM_MEMORY_ADDR_I32:
case R_WASM_MEMORY_ADDR_LEB:
case R_WASM_MEMORY_ADDR_REL_SLEB:
+ if (isa<UndefinedData>(Sym))
+ return 0;
return cast<DefinedData>(Sym)->getVirtualAddress() + Reloc.Addend;
case R_WASM_TYPE_INDEX_LEB:
return TypeMap[Reloc.Index];
Modified: lld/trunk/wasm/Relocations.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/wasm/Relocations.cpp?rev=365553&r1=365552&r2=365553&view=diff
==============================================================================
--- lld/trunk/wasm/Relocations.cpp (original)
+++ lld/trunk/wasm/Relocations.cpp Tue Jul 9 13:45:20 2019
@@ -21,6 +21,25 @@ static bool requiresGOTAccess(const Symb
return Config->Pic && !Sym->isHidden() && !Sym->isLocal();
}
+static bool allowUndefined(const Symbol* Sym) {
+ // Historically --allow-undefined doesn't work for data symbols since we don't
+ // have any way to represent these as imports in the final binary. The idea
+ // behind allowing undefined symbols is to allow importing these symbols from
+ // the embedder and we can't do this for data symbols (at least not without
+ // compiling with -fPIC)
+ if (isa<DataSymbol>(Sym))
+ return false;
+ return (Config->AllowUndefined ||
+ Config->AllowUndefinedSymbols.count(Sym->getName()) != 0);
+}
+
+static void reportUndefined(const Symbol* Sym) {
+ assert(Sym->isUndefined());
+ assert(!Sym->isWeak());
+ if (!allowUndefined(Sym))
+ error(toString(Sym->getFile()) + ": undefined symbol: " + toString(*Sym));
+}
+
void lld::wasm::scanRelocations(InputChunk *Chunk) {
if (!Chunk->Live)
return;
@@ -50,15 +69,6 @@ void lld::wasm::scanRelocations(InputChu
if (!isa<GlobalSymbol>(Sym))
Out.ImportSec->addGOTEntry(Sym);
break;
- case R_WASM_MEMORY_ADDR_SLEB:
- case R_WASM_MEMORY_ADDR_LEB:
- case R_WASM_MEMORY_ADDR_REL_SLEB:
- if (!Config->Relocatable && Sym->isUndefined() && !Sym->isWeak()) {
- error(toString(File) + ": cannot resolve relocation of type " +
- relocTypeToString(Reloc.Type) +
- " against undefined (non-weak) data symbol: " + toString(*Sym));
- }
- break;
}
if (Config->Pic) {
@@ -81,6 +91,11 @@ void lld::wasm::scanRelocations(InputChu
Out.ImportSec->addGOTEntry(Sym);
break;
}
+ } else {
+ // Report undefined symbols
+ if (Sym->isUndefined() && !Config->Relocatable && !Sym->isWeak())
+ reportUndefined(Sym);
}
+
}
}
Modified: lld/trunk/wasm/SymbolTable.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/wasm/SymbolTable.cpp?rev=365553&r1=365552&r2=365553&view=diff
==============================================================================
--- lld/trunk/wasm/SymbolTable.cpp (original)
+++ lld/trunk/wasm/SymbolTable.cpp Tue Jul 9 13:45:20 2019
@@ -80,19 +80,6 @@ void SymbolTable::addCombinedLTOObject()
}
}
-void SymbolTable::reportRemainingUndefines() {
- for (const auto& Pair : SymMap) {
- const Symbol *Sym = SymVector[Pair.second];
- if (!Sym->isUndefined() || Sym->isWeak())
- continue;
- if (Config->AllowUndefinedSymbols.count(Sym->getName()) != 0)
- continue;
- if (!Sym->IsUsedInRegularObj)
- continue;
- error(toString(Sym->getFile()) + ": undefined symbol: " + toString(*Sym));
- }
-}
-
Symbol *SymbolTable::find(StringRef Name) {
auto It = SymMap.find(CachedHashStringRef(Name));
if (It == SymMap.end() || It->second == -1)
Modified: lld/trunk/wasm/SymbolTable.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/wasm/SymbolTable.h?rev=365553&r1=365552&r2=365553&view=diff
==============================================================================
--- lld/trunk/wasm/SymbolTable.h (original)
+++ lld/trunk/wasm/SymbolTable.h Tue Jul 9 13:45:20 2019
@@ -41,8 +41,6 @@ public:
void addCombinedLTOObject();
- void reportRemainingUndefines();
-
ArrayRef<Symbol *> getSymbols() const { return SymVector; }
Symbol *find(StringRef Name);
Modified: lld/trunk/wasm/Writer.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/wasm/Writer.cpp?rev=365553&r1=365552&r2=365553&view=diff
==============================================================================
--- lld/trunk/wasm/Writer.cpp (original)
+++ lld/trunk/wasm/Writer.cpp Tue Jul 9 13:45:20 2019
@@ -827,13 +827,6 @@ void Writer::run() {
if (Config->Pic)
createApplyRelocationsFunction();
createCallCtorsFunction();
-
- // Make sure we have resolved all symbols.
- if (!Config->AllowUndefined)
- Symtab->reportRemainingUndefines();
-
- if (errorCount())
- return;
}
log("-- calculateTypes");
More information about the llvm-commits
mailing list