Skip to content

[mbr] [wasm] Don't automatically turn off inlining #47246

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
lambdageek merged 1 commit into from
Jan 21, 2021
Merged

[mbr] [wasm] Don't automatically turn off inlining #47246

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
3 changes: 3 additions & 0 deletions src/mono/netcore/sample/mbr/browser/runtime.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ var Module = {
config.loaded_cb = function () {
App.init ();
};
config.environment_variables = {
"MONO_METADATA_UPDATE": "1"
};
config.fetch_file_cb = function (asset) {
return fetch (asset, { credentials: 'same-origin' });
}
Expand Down
11 changes: 8 additions & 3 deletions src/mono/wasm/runtime/driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ void mono_icall_table_init (void);
void mono_aot_register_module (void **aot_info);
char *monoeg_g_getenv(const char *variable);
int monoeg_g_setenv(const char *variable, const char *value, int overwrite);
int32_t monoeg_g_hasenv(const char *variable);
void mono_free (void*);
int32_t mini_parse_debug_option (const char *option);
char *mono_method_get_full_name (MonoMethod *method);
Expand Down Expand Up @@ -466,9 +467,6 @@ EMSCRIPTEN_KEEPALIVE void
mono_wasm_load_runtime (const char *unused, int debug_level)
{
const char *interp_opts = "";
#ifdef ENABLE_METADATA_UPDATE
interp_opts = "-inline"; /* FIXME: EnC hack - make this configurable */
#endif

#ifdef DEBUG
monoeg_g_setenv ("MONO_LOG_LEVEL", "debug", 0);
Expand Down Expand Up @@ -505,6 +503,12 @@ mono_wasm_load_runtime (const char *unused, int debug_level)
#else
mono_jit_set_aot_mode (MONO_AOT_MODE_INTERP_ONLY);

#ifdef ENABLE_METADATA_UPDATE
if (monoeg_g_hasenv ("MONO_METADATA_UPDATE")) {
interp_opts = "-inline";
}
#endif

/*
* debug_level > 0 enables debugging and sets the debug log level to debug_level
* debug_level == 0 disables debugging and enables interpreter optimizations
Expand All @@ -517,6 +521,7 @@ mono_wasm_load_runtime (const char *unused, int debug_level)
interp_opts = "-all";
mono_wasm_enable_debugging (debug_level);
}

#endif

#ifdef LINK_ICALLS
Expand Down