shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[lld][WebAssembly] Abide by configured page size for memory imports (#146916)

Browse Source 
This was an oversight in
https://github.com/llvm/llvm-project/pull/128942 where I forgot to add
the configured page size to the `WasmLimits` in the import we emit when
importing a memory.

Fixes: #146713
This commit is contained in:
Nick Fitzgerald 2025-07-07 09:40:09 -07:00 committed by GitHub
parent c30b5b1549
commit 463b3cb93f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lld/test/wasm/page-size.s
View File

@ -41,3 +41,21 @@ foo:
# CHECK-DEFAULT-DIS: <_start>:
# CHECK-DEFAULT-DIS: i32.const 65536
# CHECK-DEFAULT-DIS-NEXT: end
# RUN: wasm-ld -no-gc-sections -o %t.custom-import.wasm %t.o --page-size=1 --import-memory
# RUN: obj2yaml %t.custom-import.wasm | FileCheck %s --check-prefix=CHECK-CUSTOM-IMPORT
# CHECK-CUSTOM-IMPORT: Imports:
# CHECK-CUSTOM-IMPORT-NEXT: - Module: env
# CHECK-CUSTOM-IMPORT-NEXT: Field: memory
# CHECK-CUSTOM-IMPORT-NEXT: Kind: MEMORY
# CHECK-CUSTOM-IMPORT-NEXT: Memory:
# CHECK-CUSTOM-IMPORT-NEXT: Flags: [ HAS_PAGE_SIZE ]
# CHECK-CUSTOM-IMPORT-NEXT: Minimum: 0x10410
# CHECK-CUSTOM-IMPORT-NEXT: PageSize: 0x1
# RUN: llvm-objdump --disassemble-symbols=_start %t.custom-import.wasm | FileCheck %s --check-prefix=CHECK-CUSTOM-IMPORT-DIS
# CHECK-CUSTOM-IMPORT-DIS: <_start>:
# CHECK-CUSTOM-IMPORT-DIS: i32.const 1
# CHECK-CUSTOM-IMPORT-DIS-NEXT: end

4
lld/wasm/SyntheticSections.cpp
View File

@ -258,6 +258,10 @@ void ImportSection::writeBody() {
import.Memory.Flags |= WASM_LIMITS_FLAG_IS_SHARED;
if (is64)
import.Memory.Flags |= WASM_LIMITS_FLAG_IS_64;
if (ctx.arg.pageSize != WasmDefaultPageSize) {
import.Memory.Flags |= WASM_LIMITS_FLAG_HAS_PAGE_SIZE;
import.Memory.PageSize = ctx.arg.pageSize;
}
writeImport(os, import);
}