Skip to content

Commit

Permalink
Fix a merge conflict on main (#3378)
Browse files Browse the repository at this point in the history
This commit fixes a "merge conflict" with #3319 being merged into
`main`, causing CI failures on merge.
  • Loading branch information
alexcrichton authored Sep 21, 2021
1 parent bcf3544 commit 1a5a2c7
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions crates/wasmtime/src/func.rs
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

0 comments on commit 1a5a2c7

Please sign in to comment.