[PATCH] D102271: [lld][WebAssembly] Fix for string merging + negative addends
Sam Clegg via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Tue May 11 12:21:19 PDT 2021
sbc100 updated this revision to Diff 344534.
sbc100 added a comment.
rebase
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D102271/new/
https://reviews.llvm.org/D102271
Files:
lld/test/wasm/merge-string.s
lld/wasm/InputFiles.cpp
lld/wasm/Symbols.cpp
lld/wasm/Symbols.h
Index: lld/wasm/Symbols.h
===================================================================
--- lld/wasm/Symbols.h
+++ lld/wasm/Symbols.h
@@ -290,7 +290,7 @@
static bool classof(const Symbol *s) { return s->kind() == DefinedDataKind; }
// Returns the output virtual address of a defined data symbol.
- uint64_t getVA(uint64_t addend = 0) const;
+ uint64_t getVA() const;
void setVA(uint64_t va);
// Returns the offset of a defined data symbol within its OutputSegment.
Index: lld/wasm/Symbols.cpp
===================================================================
--- lld/wasm/Symbols.cpp
+++ lld/wasm/Symbols.cpp
@@ -286,10 +286,10 @@
function ? &function->signature : nullptr),
function(function) {}
-uint64_t DefinedData::getVA(uint64_t addend) const {
+uint64_t DefinedData::getVA() const {
LLVM_DEBUG(dbgs() << "getVA: " << getName() << "\n");
if (segment)
- return segment->getVA(value + addend);
+ return segment->getVA(value);
return value;
}
Index: lld/wasm/InputFiles.cpp
===================================================================
--- lld/wasm/InputFiles.cpp
+++ lld/wasm/InputFiles.cpp
@@ -185,7 +185,7 @@
if (D->segment && D->segment->outputSeg->isTLS())
return D->getOutputSegmentOffset() + reloc.Addend;
- uint64_t value = D->getVA(reloc.Addend);
+ uint64_t value = D->getVA() + reloc.Addend;
if (reloc.Type == R_WASM_MEMORY_ADDR_LOCREL_I32) {
const auto *segment = cast<InputSegment>(chunk);
uint64_t p = segment->outputSeg->startVA + segment->outputSegmentOffset +
Index: lld/test/wasm/merge-string.s
===================================================================
--- lld/test/wasm/merge-string.s
+++ lld/test/wasm/merge-string.s
@@ -14,6 +14,11 @@
.asciz "bc"
.size bar, 4
+ .section .rodata_relocs,"",@
+negative_addend:
+ .int32 foo-10
+ .size negative_addend, 4
+
.globl foo
.globl bar
.export_name foo, foo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D102271.344534.patch
Type: text/x-patch
Size: 1998 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210511/b8d8f1dc/attachment.bin>
More information about the llvm-commits
mailing list