mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-21 16:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

wasm-linker: allow explicit memory exports

Browse Source 
Rather than verifying if importing memory is false, we now rely
on the option that was passed to the CLI (where export is defaulted
to `true` unless only import-memory is given).
This commit is contained in:
Luuk de Gram 2023-07-16 16:07:20 +02:00
parent 70c71935c7
commit 388589987c
No known key found for this signature in database
GPG Key ID: A8CFE58E4DC7D664
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/link/Wasm.zig
View File

@ -3519,6 +3519,7 @@ fn writeToFile(
// Import section
const import_memory = wasm.base.options.import_memory or is_obj;
const export_memory = wasm.base.options.export_memory;
if (wasm.imports.count() != 0 or import_memory) {
const header_offset = try reserveVecSectionHeader(&binary_bytes);
@ -3621,7 +3622,7 @@ fn writeToFile(
}
// Export section
if (wasm.exports.items.len != 0 or !import_memory) {
if (wasm.exports.items.len != 0 or export_memory) {
const header_offset = try reserveVecSectionHeader(&binary_bytes);
for (wasm.exports.items) |exp| {
@ -3632,7 +3633,7 @@ fn writeToFile(
try leb.writeULEB128(binary_writer, exp.index);
}
if (!import_memory) {
if (export_memory) {
try leb.writeULEB128(binary_writer, @as(u32, @intCast("memory".len)));
try binary_writer.writeAll("memory");
try binary_writer.writeByte(std.wasm.externalKind(.memory));
@ -3644,7 +3645,7 @@ fn writeToFile(
header_offset,
.@"export",
@as(u32, @intCast(binary_bytes.items.len - header_offset - header_size)),
@as(u32, @intCast(wasm.exports.items.len)) + @intFromBool(!import_memory),
@as(u32, @intCast(wasm.exports.items.len)) + @intFromBool(export_memory),
);
section_count += 1;
}