[PATCH] D43726: [WebAssembly] Inline translateVA as it's trivial.

[Rui Ueyama via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL326291: [WebAssembly] Inline translateVA as it's trivial. (authored by ruiu, committed by ).

Changed prior to commit:
  https://reviews.llvm.org/D43726?vs=135783&id=136199#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D43726

Files:
  lld/trunk/wasm/InputChunks.cpp
  lld/trunk/wasm/InputChunks.h
  lld/trunk/wasm/Symbols.cpp


Index: lld/trunk/wasm/InputChunks.cpp
===================================================================
--- lld/trunk/wasm/InputChunks.cpp
+++ lld/trunk/wasm/InputChunks.cpp
@@ -27,12 +27,6 @@
   return (toString(C->File) + ":(" + C->getName() + ")").str();
 }
 
-uint32_t InputSegment::translateVA(uint32_t Offset) const {
-  assert(Offset <= getSize());
-  DEBUG(dbgs() << "translateVA: " << getName() << " Offset=" << Offset << "\n");
-  return OutputSeg->StartVA + OutputSegmentOffset + Offset;
-}
-
 void InputChunk::copyRelocations(const WasmSection &Section) {
   if (Section.Relocations.empty())
     return;
Index: lld/trunk/wasm/Symbols.cpp
===================================================================
--- lld/trunk/wasm/Symbols.cpp
+++ lld/trunk/wasm/Symbols.cpp
@@ -157,7 +157,9 @@
 
 uint32_t DefinedData::getVirtualAddress() const {
   DEBUG(dbgs() << "getVirtualAddress: " << getName() << "\n");
-  return Segment ? Segment->translateVA(Offset) : Offset;
+  if (Segment)
+    return Segment->OutputSeg->StartVA + Segment->OutputSegmentOffset + Offset;
+  return Offset;
 }
 
 void DefinedData::setVirtualAddress(uint32_t Value) {
Index: lld/trunk/wasm/InputChunks.h
===================================================================
--- lld/trunk/wasm/InputChunks.h
+++ lld/trunk/wasm/InputChunks.h
@@ -96,10 +96,6 @@
 
   static bool classof(const InputChunk *C) { return C->kind() == DataSegment; }
 
-  // Translate an offset in the input segment to an offset in the output
-  // segment.
-  uint32_t translateVA(uint32_t Offset) const;
-
   uint32_t getAlignment() const { return Segment.Data.Alignment; }
   StringRef getName() const override { return Segment.Data.Name; }
   StringRef getComdat() const override { return Segment.Data.Comdat; }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D43726.136199.patch
Type: text/x-patch
Size: 1775 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180228/8c210dc4/attachment.bin>