summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lld/test/wasm/relocatable.ll2
-rw-r--r--lld/test/wasm/weak-undefined.ll (renamed from lld/test/wasm/weak-external.ll)16
-rw-r--r--lld/wasm/InputFiles.cpp4
-rw-r--r--lld/wasm/OutputSections.cpp6
-rw-r--r--lld/wasm/Symbols.cpp8
-rw-r--r--lld/wasm/Symbols.h15
-rw-r--r--lld/wasm/Writer.cpp10
7 files changed, 26 insertions, 35 deletions
diff --git a/lld/test/wasm/relocatable.ll b/lld/test/wasm/relocatable.ll
index d9d2e02bdab..ce006a71d35 100644
--- a/lld/test/wasm/relocatable.ll
+++ b/lld/test/wasm/relocatable.ll
@@ -159,7 +159,7 @@ declare i32 @foo_import() local_unnamed_addr
; CHECK-NEXT: Offset:
; CHECK-NEXT: Opcode: I32_CONST
; CHECK-NEXT: Value: 16
-; CHECK-NEXT: Content: FFFFFFFF
+; CHECK-NEXT: Content: '00000000'
; CHECK-NEXT: - Type: CUSTOM
; CHECK-NEXT: Name: linking
; CHECK-NEXT: DataSize: 20
diff --git a/lld/test/wasm/weak-external.ll b/lld/test/wasm/weak-undefined.ll
index e5025db5369..36b842e32d7 100644
--- a/lld/test/wasm/weak-external.ll
+++ b/lld/test/wasm/weak-undefined.ll
@@ -40,8 +40,8 @@ entry:
; CHECK-NEXT: - ElemType: ANYFUNC
; CHECK-NEXT: Limits:
; CHECK-NEXT: Flags: [ HAS_MAX ]
-; CHECK-NEXT: Initial: 0x00000002
-; CHECK-NEXT: Maximum: 0x00000002
+; CHECK-NEXT: Initial: 0x00000001
+; CHECK-NEXT: Maximum: 0x00000001
; CHECK-NEXT: - Type: MEMORY
; CHECK-NEXT: Memories:
; CHECK-NEXT: - Initial: 0x00000002
@@ -66,20 +66,14 @@ entry:
; CHECK-NEXT: - Name: get_address_of_global_var
; CHECK-NEXT: Kind: FUNCTION
; CHECK-NEXT: Index: 1
-; CHECK-NEXT: - Type: ELEM
-; CHECK-NEXT: Segments:
-; CHECK-NEXT: - Offset:
-; CHECK-NEXT: Opcode: I32_CONST
-; CHECK-NEXT: Value: 1
-; CHECK-NEXT: Functions: [ 0 ]
; CHECK-NEXT: - Type: CODE
; CHECK-NEXT: Functions:
; CHECK-NEXT: - Locals:
-; CHECK-NEXT: Body: 4181808080000B
+; CHECK-NEXT: Body: 4180808080000B
; CHECK-NEXT: - Locals:
-; CHECK-NEXT: Body: 41FFFFFFFF7F0B
+; CHECK-NEXT: Body: 4180808080000B
; CHECK-NEXT: - Locals:
-; CHECK-NEXT: Body: 41002802FFFFFFFF0F0B
+; CHECK-NEXT: Body: 4100280280808080000B
; CHECK-NEXT: - Type: CUSTOM
; CHECK-NEXT: Name: linking
; CHECK-NEXT: DataSize: 0
diff --git a/lld/wasm/InputFiles.cpp b/lld/wasm/InputFiles.cpp
index 1a1a6812c48..264b106357f 100644
--- a/lld/wasm/InputFiles.cpp
+++ b/lld/wasm/InputFiles.cpp
@@ -83,7 +83,7 @@ uint32_t ObjFile::relocateTypeIndex(uint32_t Original) const {
uint32_t ObjFile::relocateTableIndex(uint32_t Original) const {
Symbol *Sym = getTableSymbol(Original);
- uint32_t Index = Sym->getTableIndex();
+ uint32_t Index = Sym->hasTableIndex() ? Sym->getTableIndex() : 0;
DEBUG(dbgs() << "relocateTableIndex: " << toString(*Sym) << ": " << Original
<< " -> " << Index << "\n");
return Index;
@@ -91,7 +91,7 @@ uint32_t ObjFile::relocateTableIndex(uint32_t Original) const {
uint32_t ObjFile::relocateGlobalIndex(uint32_t Original) const {
Symbol *Sym = getGlobalSymbol(Original);
- uint32_t Index = Sym->getOutputIndex();
+ uint32_t Index = Sym->hasOutputIndex() ? Sym->getOutputIndex() : 0;
DEBUG(dbgs() << "relocateGlobalIndex: " << toString(*Sym) << ": " << Original
<< " -> " << Index << "\n");
return Index;
diff --git a/lld/wasm/OutputSections.cpp b/lld/wasm/OutputSections.cpp
index a5553826906..b2ed5810bbd 100644
--- a/lld/wasm/OutputSections.cpp
+++ b/lld/wasm/OutputSections.cpp
@@ -157,16 +157,12 @@ static void calcRelocations(const ObjFile &File,
if (Config->EmitRelocs)
NewReloc.NewIndex = calcNewIndex(File, Reloc);
- else
- NewReloc.NewIndex = UINT32_MAX;
switch (Reloc.Type) {
case R_WEBASSEMBLY_MEMORY_ADDR_SLEB:
case R_WEBASSEMBLY_MEMORY_ADDR_I32:
case R_WEBASSEMBLY_MEMORY_ADDR_LEB:
- NewReloc.Value = File.getRelocatedAddress(Reloc.Index);
- if (NewReloc.Value != UINT32_MAX)
- NewReloc.Value += Reloc.Addend;
+ NewReloc.Value = File.getRelocatedAddress(Reloc.Index) + Reloc.Addend;
break;
default:
NewReloc.Value = calcNewIndex(File, Reloc);
diff --git a/lld/wasm/Symbols.cpp b/lld/wasm/Symbols.cpp
index 6bf5459c266..1c4e36b5411 100644
--- a/lld/wasm/Symbols.cpp
+++ b/lld/wasm/Symbols.cpp
@@ -40,7 +40,7 @@ uint32_t Symbol::getVirtualAddress() const {
assert(isGlobal());
DEBUG(dbgs() << "getVirtualAddress: " << getName() << "\n");
if (isUndefined())
- return UINT32_MAX;
+ return 0;
if (VirtualAddress.hasValue())
return VirtualAddress.getValue();
@@ -53,12 +53,6 @@ uint32_t Symbol::getVirtualAddress() const {
return Segment->translateVA(Global.InitExpr.Value.Int32);
}
-uint32_t Symbol::getOutputIndex() const {
- if (isUndefined() && isWeak())
- return 0;
- return OutputIndex.getValue();
-}
-
void Symbol::setVirtualAddress(uint32_t Value) {
DEBUG(dbgs() << "setVirtualAddress " << Name << " -> " << Value << "\n");
assert(!VirtualAddress.hasValue());
diff --git a/lld/wasm/Symbols.h b/lld/wasm/Symbols.h
index 8194bcaca38..19e8bfe0193 100644
--- a/lld/wasm/Symbols.h
+++ b/lld/wasm/Symbols.h
@@ -71,23 +71,28 @@ public:
bool hasFunctionType() const { return FunctionType != nullptr; }
const WasmSignature &getFunctionType() const;
- uint32_t getOutputIndex() const;
- uint32_t getTableIndex() const { return TableIndex.getValue(); }
- // Returns the virtual address of a defined global.
- // Only works for globals, not functions.
- uint32_t getVirtualAddress() const;
+ uint32_t getOutputIndex() const { return OutputIndex.getValue(); }
+
+ // Returns true if an output index has been set for this symbol
+ bool hasOutputIndex() const { return OutputIndex.hasValue(); }
// Set the output index of the symbol (in the function or global index
// space of the output object.
void setOutputIndex(uint32_t Index);
+ uint32_t getTableIndex() const { return TableIndex.getValue(); }
+
// Returns true if a table index has been set for this symbol
bool hasTableIndex() const { return TableIndex.hasValue(); }
// Set the table index of the symbol
void setTableIndex(uint32_t Index);
+ // Returns the virtual address of a defined global.
+ // Only works for globals, not functions.
+ uint32_t getVirtualAddress() const;
+
void setVirtualAddress(uint32_t VA);
void update(Kind K, InputFile *F = nullptr, const WasmSymbol *Sym = nullptr,
diff --git a/lld/wasm/Writer.cpp b/lld/wasm/Writer.cpp
index e7dd49d5221..dfa0760509d 100644
--- a/lld/wasm/Writer.cpp
+++ b/lld/wasm/Writer.cpp
@@ -629,12 +629,14 @@ void Writer::assignSymbolIndexes() {
Sym->setOutputIndex(GlobalIndex++);
}
}
+ }
+ for (ObjFile *File : Symtab->ObjectFiles) {
for (Symbol *Sym : File->getTableSymbols()) {
- if (!Sym->hasTableIndex()) {
- Sym->setTableIndex(TableIndex++);
- IndirectFunctions.emplace_back(Sym);
- }
+ if (Sym->hasTableIndex() || !Sym->hasOutputIndex())
+ continue;
+ Sym->setTableIndex(TableIndex++);
+ IndirectFunctions.emplace_back(Sym);
}
}
}
OpenPOWER on IntegriCloud