fixup! stack-switching: add stub Val::ContRef

Author: posborne

crates/c-api/src/val.rs

@@ -98,6 +98,7 @@ impl wasm_val_t {
             Val::ExternRef(_) => crate::abort("creating a wasm_val_t from an externref"),
             Val::ExnRef(_) => crate::abort("creating a wasm_val_t from  an exnref"),
             Val::V128(_) => crate::abort("creating a wasm_val_t from a v128"),
+            Val::ContRef(_) => crate::abort("creating a wasm_val_t from a contref"),
         }
     }
 
@@ -259,6 +260,7 @@ impl wasmtime_val_t {
                     v128: val.as_u128().to_le_bytes(),
                 },
             },
+            Val::ContRef(_) => crate::abort("contrefs not yet supported in C API (#10248)"),
         }
     }
 

crates/fuzzing/src/generators/value.rs

@@ -18,6 +18,7 @@ pub enum DiffValue {
     ExternRef { null: bool },
     AnyRef { null: bool },
     ExnRef { null: bool },
+    ContRef { null: bool },
 }
 
 impl DiffValue {
@@ -32,6 +33,7 @@ impl DiffValue {
             DiffValue::ExternRef { .. } => DiffValueType::ExternRef,
             DiffValue::AnyRef { .. } => DiffValueType::AnyRef,
             DiffValue::ExnRef { .. } => DiffValueType::ExnRef,
+            DiffValue::ContRef { .. } => DiffValueType::ContRef,
         }
     }
 
@@ -189,6 +191,7 @@ impl DiffValue {
             ExternRef => DiffValue::ExternRef { null: true },
             AnyRef => DiffValue::AnyRef { null: true },
             ExnRef => DiffValue::ExnRef { null: true },
+            ContRef => DiffValue::ContRef { null: true },
         };
         arbitrary::Result::Ok(val)
     }
@@ -236,6 +239,7 @@ impl Hash for DiffValue {
             DiffValue::FuncRef { null } => null.hash(state),
             DiffValue::AnyRef { null } => null.hash(state),
             DiffValue::ExnRef { null } => null.hash(state),
+            DiffValue::ContRef { null } => null.hash(state),
         }
     }
 }
@@ -273,6 +277,7 @@ impl PartialEq for DiffValue {
             (Self::ExternRef { null: a }, Self::ExternRef { null: b }) => a == b,
             (Self::AnyRef { null: a }, Self::AnyRef { null: b }) => a == b,
             (Self::ExnRef { null: a }, Self::ExnRef { null: b }) => a == b,
+            (Self::ContRef { null: a }, Self::ContRef { null: b }) => a == b,
             _ => false,
         }
     }
@@ -291,6 +296,7 @@ pub enum DiffValueType {
     ExternRef,
     AnyRef,
     ExnRef,
+    ContRef,
 }
 
 impl TryFrom<wasmtime::ValType> for DiffValueType {
@@ -310,6 +316,7 @@ impl TryFrom<wasmtime::ValType> for DiffValueType {
                 (true, HeapType::I31) => Ok(Self::AnyRef),
                 (true, HeapType::None) => Ok(Self::AnyRef),
                 (true, HeapType::Exn) => Ok(Self::ExnRef),
+                (true, HeapType::Cont) => Ok(Self::ContRef),
                 _ => Err("non-null reference types are not supported yet"),
             },
         }

crates/fuzzing/src/oracles/diff_spec.rs

@@ -107,7 +107,8 @@ impl From<&DiffValue> for SpecValue {
             DiffValue::FuncRef { .. }
             | DiffValue::ExternRef { .. }
             | DiffValue::AnyRef { .. }
-            | DiffValue::ExnRef { .. } => {
+            | DiffValue::ExnRef { .. }
+            | DiffValue::ContRef { .. } => {
                 unimplemented!()
             }
         }

crates/fuzzing/src/oracles/diff_v8.rs

@@ -191,6 +191,7 @@ impl DiffInstance for V8Instance {
                 DiffValue::V128(_) => return Ok(None),
                 DiffValue::AnyRef { .. } => unimplemented!(),
                 DiffValue::ExnRef { .. } => unimplemented!(),
+                DiffValue::ContRef { .. } => unimplemented!(),
             });
         }
         // JS doesn't support v128 return values
@@ -316,6 +317,7 @@ fn get_diff_value(
         DiffValueType::AnyRef => unimplemented!(),
         DiffValueType::ExnRef => unimplemented!(),
         DiffValueType::V128 => unreachable!(),
+        DiffValueType::ContRef => unimplemented!(),
     }
 }
 

crates/fuzzing/src/oracles/diff_wasmi.rs

@@ -195,6 +195,7 @@ impl From<&DiffValue> for wasmi::Val {
             }
             DiffValue::AnyRef { .. } => unimplemented!(),
             DiffValue::ExnRef { .. } => unimplemented!(),
+            DiffValue::ContRef { .. } => unimplemented!(),
         }
     }
 }

crates/fuzzing/src/oracles/diff_wasmtime.rs

@@ -227,6 +227,10 @@ impl From<&DiffValue> for Val {
                 assert!(null);
                 Val::ExnRef(None)
             }
+            DiffValue::ContRef { null } => {
+                assert!(null);
+                Val::ExnRef(None)
+            }
         }
     }
 }
@@ -243,6 +247,7 @@ impl From<Val> for DiffValue {
             Val::FuncRef(r) => DiffValue::FuncRef { null: r.is_none() },
             Val::AnyRef(r) => DiffValue::AnyRef { null: r.is_none() },
             Val::ExnRef(e) => DiffValue::ExnRef { null: e.is_none() },
+            Val::ContRef(c) => DiffValue::ContRef { null: c.is_none() },
         }
     }
 }