From dc4288cea1e403f011ec4ad7539df0f1b4dfdf47 Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Fri, 18 Dec 2020 10:20:59 -0800 Subject: MemoryPacking: Preserve segment names (#3458) Also, avoid packing builtin llvm segments names so that segments such as `__llvm_covfun` (use by llvm-cov) are preserved in the final output. --- src/wasm/wasm-s-parser.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'src/wasm/wasm-s-parser.cpp') diff --git a/src/wasm/wasm-s-parser.cpp b/src/wasm/wasm-s-parser.cpp index 32b62d0e1..20e99436a 100644 --- a/src/wasm/wasm-s-parser.cpp +++ b/src/wasm/wasm-s-parser.cpp @@ -2337,7 +2337,7 @@ void SExpressionWasmBuilder::parseMemory(Element& s, bool preParseImport) { // (memory (data ..)) format auto j = parseMemoryIndex(inner, 1); auto offset = allocator.alloc()->set(Literal(int32_t(0))); - parseInnerData(inner, j, offset, false); + parseInnerData(inner, j, {}, offset, false); wasm.memory.initial = wasm.memory.segments[0].data.size(); return; } @@ -2399,16 +2399,11 @@ void SExpressionWasmBuilder::parseData(Element& s) { if (s.size() != 3 && s.size() != 4) { throw ParseException("Unexpected data items", s.line, s.col); } - parseInnerData(s, s.size() - 1, offset, isPassive); - if (name.is()) { - wasm.memory.segments.back().name = name; - } + parseInnerData(s, s.size() - 1, name, offset, isPassive); } -void SExpressionWasmBuilder::parseInnerData(Element& s, - Index i, - Expression* offset, - bool isPassive) { +void SExpressionWasmBuilder::parseInnerData( + Element& s, Index i, Name name, Expression* offset, bool isPassive) { std::vector data; while (i < s.size()) { const char* input = s[i++]->c_str(); @@ -2417,7 +2412,7 @@ void SExpressionWasmBuilder::parseInnerData(Element& s, } } wasm.memory.segments.emplace_back( - isPassive, offset, data.data(), data.size()); + name, isPassive, offset, data.data(), data.size()); } void SExpressionWasmBuilder::parseExport(Element& s) { -- cgit v1.2.3