[PATCH] D102271: [lld][WebAssembly] Fix for string merging + negative addends

[Sam Clegg via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rG19cedd3cd3ab: [lld][WebAssembly] Fix for string merging + negative addends (authored by sbc100).

Changed prior to commit:
  https://reviews.llvm.org/D102271?vs=344534&id=344620#toc

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;
 }
 
@@ -301,7 +301,7 @@
 
 uint64_t DefinedData::getOutputSegmentOffset() const {
   LLVM_DEBUG(dbgs() << "getOutputSegmentOffset: " << getName() << "\n");
-  return segment->outputSegmentOffset + value;
+  return segment->getOffset(value);
 }
 
 uint64_t DefinedData::getOutputSegmentIndex() const {
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
@@ -1,6 +1,12 @@
 // RUN: llvm-mc -filetype=obj -triple=wasm32-unknown-unknown %s -o %t.o
-// RUN: wasm-ld -O2 %t.o -o %t.wasm --no-gc-sections --no-entry
+// RUN: wasm-ld -O1 %t.o -o %t.wasm --no-gc-sections --no-entry
 // RUN: obj2yaml %t.wasm | FileCheck %s --check-prefixes=COMMON,MERGE
+
+// Check that the default is the same as -O1 (since we default to -O1)
+// RUN: wasm-ld %t.o -o %t.wasm --no-gc-sections --no-entry
+// RUN: obj2yaml %t.wasm | FileCheck %s --check-prefixes=COMMON,MERGE
+
+// Check that -O0 disables merging
 // RUN: wasm-ld -O0 %t.o -o %t2.wasm --no-gc-sections --no-entry
 // RUN: obj2yaml %t2.wasm | FileCheck --check-prefixes=COMMON,NOMERGE %s
 
@@ -14,6 +20,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.344620.patch
Type: text/x-patch
Size: 2972 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210512/6862737f/attachment.bin>