diff options
| author | Arthur Islamov <me@daken.ru> | 2023-07-18 21:57:11 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-18 10:57:11 -0700 |
| commit | 4a6d45ff6ffd0eae971f4b0894b69f365cfc86c6 (patch) | |
| tree | 2af694153605ee4e82289c361489b086e2db6d82 /src/passes/MemoryPacking.cpp | |
| parent | 159750d0fccd7ee453ac2f8569128e0ea94ba8a5 (diff) | |
| download | binaryen-4a6d45ff6ffd0eae971f4b0894b69f365cfc86c6.tar.gz binaryen-4a6d45ff6ffd0eae971f4b0894b69f365cfc86c6.tar.bz2 binaryen-4a6d45ff6ffd0eae971f4b0894b69f365cfc86c6.zip | |
MemoryPacking: memory.init fixes for 64 bit (#5809)
Fixes emscripten-core/emscripten#17485
This allows emscripten to complie code with MEMORY64 + PTHREADS by
fixing using the proper pointer type in the MemoryPacking pass.
Diffstat (limited to 'src/passes/MemoryPacking.cpp')
| -rw-r--r-- | src/passes/MemoryPacking.cpp | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/src/passes/MemoryPacking.cpp b/src/passes/MemoryPacking.cpp index 5f72a916d..e0ce6294b 100644 --- a/src/passes/MemoryPacking.cpp +++ b/src/passes/MemoryPacking.cpp @@ -710,6 +710,7 @@ void MemoryPacking::createReplacements(Module* module, size_t bytesWritten = 0; + auto is64 = module->getMemory(init->memory)->is64(); for (size_t i = firstRangeIdx; i < ranges.size() && ranges[i].start < end; ++i) { auto& range = ranges[i]; @@ -721,12 +722,12 @@ void MemoryPacking::createReplacements(Module* module, dest = builder.makeConstPtr(c->value.getInteger() + bytesWritten, ptrType); } else { - auto* get = builder.makeLocalGet(-1, Type::i32); + auto* get = builder.makeLocalGet(-1, ptrType); getVars.push_back(&get->index); dest = get; if (bytesWritten > 0) { - Const* addend = builder.makeConst(int32_t(bytesWritten)); - dest = builder.makeBinary(AddInt32, dest, addend); + Const* addend = builder.makeConstPtr(bytesWritten, ptrType); + dest = builder.makeBinary(is64 ? AddInt64 : AddInt32, dest, addend); } } @@ -751,16 +752,18 @@ void MemoryPacking::createReplacements(Module* module, // Non-zero length memory.inits must have intersected some range assert(result); - replacements[init] = [module, setVar, getVars, result](Function* function) { - if (setVar != nullptr) { - Index destVar = Builder(*module).addVar(function, Type::i32); - *setVar = destVar; - for (auto* getVar : getVars) { - *getVar = destVar; + replacements[init] = + [module, init, setVar, getVars, result](Function* function) { + if (setVar != nullptr) { + auto indexType = module->getMemory(init->memory)->indexType; + Index destVar = Builder(*module).addVar(function, indexType); + *setVar = destVar; + for (auto* getVar : getVars) { + *getVar = destVar; + } } - } - return result; - }; + return result; + }; } // Create replacements for data.drop instructions now that we know whether we |