diff options
author | Andy Wingo <wingo@igalia.com> | 2020-11-30 14:55:29 +0100 |
---|---|---|
committer | Andy Wingo <wingo@igalia.com> | 2021-01-19 09:40:42 +0100 |
commit | 831a143e50cac873ec095fc7139a485173ba8c35 (patch) | |
tree | 3fd4fba16800ccbb8fd72292995ebc9cfa7896a0 /llvm/lib/Object/WasmObjectFile.cpp | |
parent | 418df4a6ab35d343cc0f2608c90a73dd9b8d0ab1 (diff) | |
download | llvm-831a143e50cac873ec095fc7139a485173ba8c35.zip llvm-831a143e50cac873ec095fc7139a485173ba8c35.tar.gz llvm-831a143e50cac873ec095fc7139a485173ba8c35.tar.bz2 |
[WebAssembly] Change prefix on data segment flags to WASM_DATA_SEGMENT
Element sections will also need flags, so we shouldn't squat the
WASM_SEGMENT namespace.
Depends on D90948.
Differential Revision: https://reviews.llvm.org/D92315
Diffstat (limited to 'llvm/lib/Object/WasmObjectFile.cpp')
-rw-r--r-- | llvm/lib/Object/WasmObjectFile.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/llvm/lib/Object/WasmObjectFile.cpp b/llvm/lib/Object/WasmObjectFile.cpp index dac16d2..a349dde 100644 --- a/llvm/lib/Object/WasmObjectFile.cpp +++ b/llvm/lib/Object/WasmObjectFile.cpp @@ -1366,9 +1366,11 @@ Error WasmObjectFile::parseDataSection(ReadContext &Ctx) { while (Count--) { WasmSegment Segment; Segment.Data.InitFlags = readVaruint32(Ctx); - Segment.Data.MemoryIndex = (Segment.Data.InitFlags & wasm::WASM_SEGMENT_HAS_MEMINDEX) - ? readVaruint32(Ctx) : 0; - if ((Segment.Data.InitFlags & wasm::WASM_SEGMENT_IS_PASSIVE) == 0) { + Segment.Data.MemoryIndex = + (Segment.Data.InitFlags & wasm::WASM_DATA_SEGMENT_HAS_MEMINDEX) + ? readVaruint32(Ctx) + : 0; + if ((Segment.Data.InitFlags & wasm::WASM_DATA_SEGMENT_IS_PASSIVE) == 0) { if (Error Err = readInitExpr(Segment.Data.Offset, Ctx)) return Err; } else { |