Merge pull request #2425 from alexcrichton/fix-wrong-store-2

Fix assertion with cross-store values in `Func::new`
This commit is contained in:
Nick Fitzgerald
2020-11-16 16:36:05 -08:00
committed by GitHub
2 changed files with 39 additions and 2 deletions

View File

@@ -295,14 +295,19 @@ impl Func {
// Unlike our arguments we need to dynamically check that the return
// values produced are correct. There could be a bug in `func` that
// produces the wrong number or wrong types of values, and we need
// to catch that here.
// produces the wrong number, wrong types, or wrong stores of
// values, and we need to catch that here.
for (i, (ret, ty)) in returns.into_iter().zip(ty_clone.results()).enumerate() {
if ret.ty() != ty {
return Err(Trap::new(
"function attempted to return an incompatible value",
));
}
if !ret.comes_from_same_store(&store) {
return Err(Trap::new(
"cross-`Store` values are not currently supported",
));
}
unsafe {
ret.write_value_to(&store, values_vec.add(i));
}