diff options
author | Wouter van Oortmerssen <aardappel@gmail.com> | 2021-02-25 13:18:34 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-25 13:18:34 -0800 |
commit | 7977ad58a367f49555c70ea5f0f0f6ab06b28903 (patch) | |
tree | 92afec6d6555f653c863a372fbfddcc66fd1d9ba /src/wasm/wasm-s-parser.cpp | |
parent | 04c1515acb354714af3d07fe2a3b65b2bb0398ab (diff) | |
download | binaryen-7977ad58a367f49555c70ea5f0f0f6ab06b28903.tar.gz binaryen-7977ad58a367f49555c70ea5f0f0f6ab06b28903.tar.bz2 binaryen-7977ad58a367f49555c70ea5f0f0f6ab06b28903.zip |
Support 64-bit data segment init-exps in Memory64 (#3593)
This as a consequence of https://reviews.llvm.org/D95651
Diffstat (limited to 'src/wasm/wasm-s-parser.cpp')
-rw-r--r-- | src/wasm/wasm-s-parser.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/wasm/wasm-s-parser.cpp b/src/wasm/wasm-s-parser.cpp index 169470181..339d3a04e 100644 --- a/src/wasm/wasm-s-parser.cpp +++ b/src/wasm/wasm-s-parser.cpp @@ -2615,7 +2615,12 @@ void SExpressionWasmBuilder::parseMemory(Element& s, bool preParseImport) { } // (memory (data ..)) format auto j = parseMemoryIndex(inner, 1); - auto offset = allocator.alloc<Const>()->set(Literal(int32_t(0))); + auto offset = allocator.alloc<Const>(); + if (wasm.memory.is64()) { + offset->set(Literal(int64_t(0))); + } else { + offset->set(Literal(int32_t(0))); + } parseInnerData(inner, j, {}, offset, false); wasm.memory.initial = wasm.memory.segments[0].data.size(); return; @@ -2641,8 +2646,13 @@ void SExpressionWasmBuilder::parseMemory(Element& s, bool preParseImport) { } const char* input = curr[j]->c_str(); auto* offset = allocator.alloc<Const>(); - offset->type = Type::i32; - offset->value = Literal(int32_t(offsetValue)); + if (wasm.memory.is64()) { + offset->type = Type::i64; + offset->value = Literal(offsetValue); + } else { + offset->type = Type::i32; + offset->value = Literal(int32_t(offsetValue)); + } if (auto size = strlen(input)) { std::vector<char> data; stringToBinary(input, size, data); |