diff options
author | Rui Ueyama <ruiu@google.com> | 2018-04-05 19:37:31 +0000 |
---|---|---|
committer | Rui Ueyama <ruiu@google.com> | 2018-04-05 19:37:31 +0000 |
commit | ac95bb1d52c9606f88cf1b3f9889159ce6afe2a2 (patch) | |
tree | d93ff59f4ea4d7f494f66b83585b15f72f0847ba /lld/wasm | |
parent | 7a598477aaf742ab4c771be79d532fd2dfc87fbe (diff) | |
download | bcm5719-llvm-ac95bb1d52c9606f88cf1b3f9889159ce6afe2a2.tar.gz bcm5719-llvm-ac95bb1d52c9606f88cf1b3f9889159ce6afe2a2.zip |
[WebAssembly] Remove another trivial accessor.
Differential Revision: https://reviews.llvm.org/D43725
llvm-svn: 329336
Diffstat (limited to 'lld/wasm')
-rw-r--r-- | lld/wasm/OutputSections.cpp | 9 | ||||
-rw-r--r-- | lld/wasm/OutputSegment.h | 8 |
2 files changed, 6 insertions, 11 deletions
diff --git a/lld/wasm/OutputSections.cpp b/lld/wasm/OutputSections.cpp index 9683a2d340d..29b1c43f06c 100644 --- a/lld/wasm/OutputSections.cpp +++ b/lld/wasm/OutputSections.cpp @@ -140,12 +140,13 @@ DataSection::DataSection(ArrayRef<OutputSegment *> Segments) writeUleb128(OS, WASM_OPCODE_END, "opcode:end"); writeUleb128(OS, Segment->Size, "segment size"); OS.flush(); - Segment->setSectionOffset(BodySize); + + Segment->SectionOffset = BodySize; BodySize += Segment->Header.size() + Segment->Size; log("Data segment: size=" + Twine(Segment->Size)); + for (InputSegment *InputSeg : Segment->InputSegments) - InputSeg->OutputOffset = Segment->getSectionOffset() + - Segment->Header.size() + + InputSeg->OutputOffset = Segment->SectionOffset + Segment->Header.size() + InputSeg->OutputSegmentOffset; } @@ -166,7 +167,7 @@ void DataSection::writeTo(uint8_t *Buf) { parallelForEach(Segments, [&](const OutputSegment *Segment) { // Write data segment header - uint8_t *SegStart = Buf + Segment->getSectionOffset(); + uint8_t *SegStart = Buf + Segment->SectionOffset; memcpy(SegStart, Segment->Header.data(), Segment->Header.size()); // Write segment data payload diff --git a/lld/wasm/OutputSegment.h b/lld/wasm/OutputSegment.h index 79730134290..d5c89cd19f4 100644 --- a/lld/wasm/OutputSegment.h +++ b/lld/wasm/OutputSegment.h @@ -32,12 +32,9 @@ public: Size += InSeg->getSize(); } - uint32_t getSectionOffset() const { return SectionOffset; } - - void setSectionOffset(uint32_t Offset) { SectionOffset = Offset; } - StringRef Name; const uint32_t Index; + uint32_t SectionOffset = 0; uint32_t Alignment = 0; uint32_t StartVA = 0; std::vector<InputSegment *> InputSegments; @@ -47,9 +44,6 @@ public: // Segment header std::string Header; - -private: - uint32_t SectionOffset = 0; }; } // namespace wasm |