Skip to content

[lld][WebAssembly] Allow --import-memory to take single name #160409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 23, 2025
Merged

[lld][WebAssembly] Allow --import-memory to take single name #160409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions lld/test/wasm/memory-naming.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,21 @@
# CHECK-IMPORT-NEXT: Index: 0
# CHECK-IMPORT-NEXT: - Type:

# RUN:wasm-ld --import-memory=foo -o %t.import.wasm %t.start.o
# RUN: obj2yaml %t.import.wasm | FileCheck -check-prefix=CHECK-IMPORT-DEFAULT %s

# Verify that memory import module defaults to `env`, which is the default
# module for all imports.

# CHECK-IMPORT-DEFAULT: - Type: IMPORT
# CHECK-IMPORT-DEFAULT-NEXT: Imports:
# CHECK-IMPORT-DEFAULT-NEXT: - Module: env
# CHECK-IMPORT-DEFAULT-NEXT: Field: foo
# CHECK-IMPORT-DEFAULT-NEXT: Kind: MEMORY
# CHECK-IMPORT-DEFAULT-NEXT: Memory:
# CHECK-IMPORT-DEFAULT-NEXT: Minimum: 0x2
# CHECK-IMPORT-DEFAULT-NEXT: - Type:

# RUN:wasm-ld --import-memory=foo,bar --export-memory=qux -o %t.both.wasm %t.start.o
# RUN: obj2yaml %t.both.wasm | FileCheck -check-prefix=CHECK-BOTH %s

Expand Down
16 changes: 7 additions & 9 deletions lld/wasm/Driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,14 +542,13 @@ static void readConfigs(opt::InputArgList &args) {
ctx.arg.noinhibitExec = args.hasArg(OPT_noinhibit_exec);

if (args.hasArg(OPT_import_memory_with_name)) {
ctx.arg.memoryImport =
args.getLastArgValue(OPT_import_memory_with_name).split(",");
auto argValue = args.getLastArgValue(OPT_import_memory_with_name);
if (argValue.contains(','))
ctx.arg.memoryImport = argValue.split(",");
else
ctx.arg.memoryImport = {defaultModule, argValue};
} else if (args.hasArg(OPT_import_memory)) {
ctx.arg.memoryImport =
std::pair<llvm::StringRef, llvm::StringRef>(defaultModule, memoryName);
} else {
ctx.arg.memoryImport =
std::optional<std::pair<llvm::StringRef, llvm::StringRef>>();
ctx.arg.memoryImport = {defaultModule, memoryName};
}

if (args.hasArg(OPT_export_memory_with_name)) {
Expand Down Expand Up @@ -746,8 +745,7 @@ static void setConfigs() {
error("--export-memory is incompatible with --shared");
}
if (!ctx.arg.memoryImport.has_value()) {
ctx.arg.memoryImport = std::pair<llvm::StringRef, llvm::StringRef>(
defaultModule, memoryName);
ctx.arg.memoryImport = {defaultModule, memoryName};
}
}

Expand Down