Skip to content

Fix a merge conflict on main #3378

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 21, 2021
Merged

Fix a merge conflict on main #3378

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
6 changes: 4 additions & 2 deletions crates/wasmtime/src/func.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,8 +766,9 @@ impl Func {
bail!("cross-`Store` values are not currently supported");
}
}
let externref_params = ty.as_wasm_func_type().externref_params_count();

let mut values_vec = write_params(store.0, params, results)?;
let mut values_vec = write_params(store.0, externref_params, params, results)?;

// Call the trampoline.
unsafe {
Expand All @@ -789,6 +790,7 @@ impl Func {

fn write_params(
store: &mut StoreOpaque,
externref_params: usize,
params: &[Val],
results: &mut [Val],
) -> Result<Vec<u128>> {
Expand All @@ -805,7 +807,7 @@ impl Func {
// because otherwise we would either keep filling up the bump chunk
// and making it larger and larger or we would always take the slow
// path when inserting references into the table.
if ty.as_wasm_func_type().externref_params_count()
if externref_params
> store
.externref_activations_table()
.bump_capacity_remaining()
Expand Down