Skip to content
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

Wasmtime: disable unwind_info unless needed #4351

Merged
merged 3 commits into from
Jun 30, 2022
Merged

Wasmtime: disable unwind_info unless needed #4351

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f609f7
Wasmtime: disable unwind_info unless needed
Stebalien Jun 29, 2022
61312a9
Wasmtime: test that disabling backtraces disables unwind_info
Stebalien Jun 29, 2022
0d342e6
fix: make sure we have unwind_info when the engine needs it
Stebalien Jun 29, 2022
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
4 changes: 4 additions & 0 deletions crates/wasmtime/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1423,6 +1423,10 @@ impl Config {
{
bail!("compiler option 'unwind_info' must be enabled when either 'backtraces' or 'reference types' are enabled");
}
} else {
self.compiler_config
.settings
.insert("unwind_info".to_string(), "false".to_string());
}
if self.features.reference_types {
if !self
Expand Down
2 changes: 1 addition & 1 deletion crates/wasmtime/src/engine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,6 @@ impl Engine {
// can affect the way the generated code performs or behaves at
// runtime.
"avoid_div_traps" => *value == FlagValue::Bool(true),
"unwind_info" => *value == FlagValue::Bool(true),
"libcall_call_conv" => *value == FlagValue::Enum("isa_default".into()),

// Features wasmtime doesn't use should all be disabled, since
Expand Down Expand Up @@ -381,6 +380,7 @@ impl Engine {
| "enable_verifier"
| "regalloc_checker"
| "is_pic"
| "unwind_info"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Note: this is inconsistent with "enable_safepoints", which checks that we don't ahve the reference_types feature enabled. But so is "enable_simd", so I'm not sure which way to go.

| "machine_code_cfg_info"
| "tls_model" // wasmtime doesn't use tls right now
| "opt_level" // opt level doesn't change semantics
Expand Down