diff options
| author | Sam Clegg <sbc@chromium.org> | 2021-02-26 16:09:32 -0800 |
|---|---|---|
| committer | Sam Clegg <sbc@chromium.org> | 2021-05-10 16:03:38 -0700 |
| commit | 3b8d2be527259b303d6c3428df16fb3fd02af2bc (patch) | |
| tree | 6a69ec8fe4f7a3702ee855682bdcc33717e9f470 /llvm/lib/MC/MCObjectFileInfo.cpp | |
| parent | 7b52aeadfa38c8a1fc0e97066f50900f1efafd42 (diff) | |
| download | llvm-3b8d2be527259b303d6c3428df16fb3fd02af2bc.zip llvm-3b8d2be527259b303d6c3428df16fb3fd02af2bc.tar.gz llvm-3b8d2be527259b303d6c3428df16fb3fd02af2bc.tar.bz2 | |
Reland: "[lld][WebAssembly] Initial support merging string data"
This change was originally landed in: 5000a1b4b9edeb9e994f2a5b36da8d48599bea49
It was reverted in: 061e071d8c9b98526f35cad55a918a4f1615afd4
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/MC/MCObjectFileInfo.cpp')
| -rw-r--r-- | llvm/lib/MC/MCObjectFileInfo.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/llvm/lib/MC/MCObjectFileInfo.cpp b/llvm/lib/MC/MCObjectFileInfo.cpp index 360ac97..92091ff 100644 --- a/llvm/lib/MC/MCObjectFileInfo.cpp +++ b/llvm/lib/MC/MCObjectFileInfo.cpp @@ -855,9 +855,9 @@ void MCObjectFileInfo::initWasmMCObjectFileInfo(const Triple &T) { // DWP Sections DwarfCUIndexSection = - Ctx->getWasmSection(".debug_cu_index", SectionKind::getMetadata(), 0); + Ctx->getWasmSection(".debug_cu_index", SectionKind::getMetadata()); DwarfTUIndexSection = - Ctx->getWasmSection(".debug_tu_index", SectionKind::getMetadata(), 0); + Ctx->getWasmSection(".debug_tu_index", SectionKind::getMetadata()); // Wasm use data section for LSDA. // TODO Consider putting each function's exception table in a separate @@ -1008,8 +1008,8 @@ MCSection *MCObjectFileInfo::getDwarfComdatSection(const char *Name, return Ctx->getELFSection(Name, ELF::SHT_PROGBITS, ELF::SHF_GROUP, 0, utostr(Hash), /*IsComdat=*/true); case Triple::Wasm: - return Ctx->getWasmSection(Name, SectionKind::getMetadata(), utostr(Hash), - MCContext::GenericSectionID); + return Ctx->getWasmSection(Name, SectionKind::getMetadata(), 0, + utostr(Hash), MCContext::GenericSectionID); case Triple::MachO: case Triple::COFF: case Triple::GOFF: |