T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a merge conflict on main (#3378)

Browse Source 
This commit fixes a "merge conflict" with #3319 being merged into
`main`, causing CI failures on merge.
This commit is contained in:
Alex Crichton
2021-09-21 15:30:07 -05:00
committed by GitHub
parent bcf3544924
commit 1a5a2c7c5d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/wasmtime/src/func.rs
View File

@@ -766,8 +766,9 @@ impl Func {
bail!("cross-`Store` values are not currently supported"); 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. // Call the trampoline.
unsafe { unsafe {
@@ -789,6 +790,7 @@ impl Func {
fn write_params( fn write_params(
store: &mut StoreOpaque, store: &mut StoreOpaque,
externref_params: usize,
params: &[Val], params: &[Val],
results: &mut [Val], results: &mut [Val],
) -> Result<Vec<u128>> { ) -> Result<Vec<u128>> {
@@ -805,7 +807,7 @@ impl Func {
// because otherwise we would either keep filling up the bump chunk // because otherwise we would either keep filling up the bump chunk
// and making it larger and larger or we would always take the slow // and making it larger and larger or we would always take the slow
// path when inserting references into the table. // path when inserting references into the table.
if ty.as_wasm_func_type().externref_params_count() if externref_params
> store > store
.externref_activations_table() .externref_activations_table()
.bump_capacity_remaining() .bump_capacity_remaining()