Skip to content

fix(wasip2): reactors to not export cli/run #708

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

Draft
ricochet wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(wasip2): reactors to not export cli/run #708

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
1 change: 0 additions & 1 deletion expected/wasm32-wasip2/defined-symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,6 @@ explicit_bzero
expm1
expm1f
expm1l
exports_wasi_cli_run_run
fabs
fabsf
fabsl
Expand Down
13 changes: 13 additions & 0 deletions libc-bottom-half/crt/crt1-command.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#endif

#include <wasi/api.h>
#include <stdbool.h>

extern void __wasi_init_tp(void);
extern void __wasm_call_ctors(void);
Expand Down Expand Up @@ -58,3 +59,15 @@ void _start(void) {
}
#endif
}


#ifdef __wasip2__
#include <wasi/libc-environ.h>

// The wasi:cli/run export for wasip2 components. This is only linked for
// command-style executables, not reactors.
bool exports_wasi_cli_run_run(void) {
__wasilibc_initialize_environ();
return __main_void() == 0;
}
#endif
9 changes: 0 additions & 9 deletions libc-bottom-half/sources/__main_void.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,3 @@ __attribute__((__weak__, nodebug)) int __main_void(void) {
return __main_argc_argv(argc, argv);
#endif
}

#ifdef __wasip2__
bool exports_wasi_cli_run_run(void) {
// TODO: this is supposed to be unnecessary, but functional/env.c fails
// without it
Comment on lines -114 to -115
Copy link
Collaborator

@alexcrichton alexcrichton Jan 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this TODO might still be applicable? Mind carrying it over?

__wasilibc_initialize_environ();
return __main_void() == 0;
}
#endif
Loading