diff options
author | Sam Clegg <sbc@chromium.org> | 2021-02-26 16:09:32 -0800 |
---|---|---|
committer | Sam Clegg <sbc@chromium.org> | 2021-05-10 13:15:12 -0700 |
commit | 5000a1b4b9edeb9e994f2a5b36da8d48599bea49 (patch) | |
tree | 2ea607d953c66899df9e9b9af3e1562dd3062f28 /llvm/lib/Object/WasmObjectFile.cpp | |
parent | 85af8a8c1b574faa0d5d57d189ae051debdfada8 (diff) | |
download | llvm-5000a1b4b9edeb9e994f2a5b36da8d48599bea49.zip llvm-5000a1b4b9edeb9e994f2a5b36da8d48599bea49.tar.gz llvm-5000a1b4b9edeb9e994f2a5b36da8d48599bea49.tar.bz2 |
[lld][WebAssembly] Initial support merging string data
This change adds support for a new WASM_SEG_FLAG_STRINGS flag in
the object format which works in a similar fashion to SHF_STRINGS
in the ELF world.
Unlike the ELF linker this support is currently limited:
- No support for SHF_MERGE (non-string merging)
- Always do full tail merging ("lo" can be merged with "hello")
- Only support single byte strings (p2align 0)
Like the ELF linker merging is only performed at `-O1` and above.
This fixes part of https://bugs.llvm.org/show_bug.cgi?id=48828,
although crucially it doesn't not currently support debug sections
because they are not represented by data segments (they are custom
sections)
Differential Revision: https://reviews.llvm.org/D97657
Diffstat (limited to 'llvm/lib/Object/WasmObjectFile.cpp')
-rw-r--r-- | llvm/lib/Object/WasmObjectFile.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Object/WasmObjectFile.cpp b/llvm/lib/Object/WasmObjectFile.cpp index 946721a..df64a46 100644 --- a/llvm/lib/Object/WasmObjectFile.cpp +++ b/llvm/lib/Object/WasmObjectFile.cpp @@ -462,7 +462,7 @@ Error WasmObjectFile::parseLinkingSection(ReadContext &Ctx) { for (uint32_t I = 0; I < Count; I++) { DataSegments[I].Data.Name = readString(Ctx); DataSegments[I].Data.Alignment = readVaruint32(Ctx); - DataSegments[I].Data.LinkerFlags = readVaruint32(Ctx); + DataSegments[I].Data.LinkingFlags = readVaruint32(Ctx); } break; } @@ -1431,7 +1431,7 @@ Error WasmObjectFile::parseDataSection(ReadContext &Ctx) { // The rest of these Data fields are set later, when reading in the linking // metadata section. Segment.Data.Alignment = 0; - Segment.Data.LinkerFlags = 0; + Segment.Data.LinkingFlags = 0; Segment.Data.Comdat = UINT32_MAX; Segment.SectionOffset = Ctx.Ptr - Ctx.Start; Ctx.Ptr += Size; |