Merge pull request bytecodealliance#38 from alexcrichton/function-ref…

…erences

Remove `HeapType::Bot` from the public API

crates/wasm-compose/src/encoding.rs

@@ -285,7 +285,6 @@ impl<'a> TypeEncoder<'a> {
                 wasmparser::HeapType::Func => HeapType::Func,
                 wasmparser::HeapType::Extern => HeapType::Extern,
                 wasmparser::HeapType::TypedFunc(i) => HeapType::TypedFunc(i.into()),
-                wasmparser::HeapType::Bot => unreachable!(),
             },
         }
     }

crates/wasm-mutate/src/module.rs

@@ -88,7 +88,6 @@ pub fn map_ref_type(tpe: wasmparser::RefType) -> Result<RefType> {
             wasmparser::HeapType::Func => HeapType::Func,
             wasmparser::HeapType::Extern => HeapType::Extern,
             wasmparser::HeapType::TypedFunc(i) => HeapType::TypedFunc(i.into()),
-            wasmparser::HeapType::Bot => unreachable!(),
         },
     })
 }

crates/wasm-mutate/src/mutators/translate.rs

@@ -205,7 +205,6 @@ pub fn heapty(t: &mut dyn Translator, ty: &wasmparser::HeapType) -> Result<HeapT
         wasmparser::HeapType::TypedFunc(i) => {
             Ok(HeapType::TypedFunc(t.remap(Item::Type, (*i).into())?))
         }
-        wasmparser::HeapType::Bot => unreachable!(),
     }
 }
 

crates/wasm-smith/src/core.rs

@@ -1644,7 +1644,6 @@ fn convert_reftype(ty: wasmparser::RefType) -> RefType {
             wasmparser::HeapType::Func => wasm_encoder::HeapType::Func,
             wasmparser::HeapType::Extern => wasm_encoder::HeapType::Extern,
             wasmparser::HeapType::TypedFunc(i) => wasm_encoder::HeapType::TypedFunc(i.into()),
-            wasmparser::HeapType::Bot => unreachable!(),
         },
     }
 }

crates/wasmparser/src/readers/core/types.rs

@@ -101,8 +101,6 @@ pub enum HeapType {
     Func,
     /// From reference types
     Extern,
-    /// Special bottom heap type
-    Bot,
 }
 
 impl ValType {

crates/wasmparser/src/validator.rs

@@ -1504,9 +1504,4 @@ mod tests {
 
         Ok(())
     }
-
-    #[test]
-    fn valtype_is_small() {
-        assert_eq!(std::mem::size_of::<ValType>(), 4);
-    }
 }

crates/wasmparser/src/validator/core.rs

@@ -810,7 +810,6 @@ impl Module {
                 // Just check that the index is valid
                 self.func_type_at(type_index.into(), types, offset)?;
             }
-            HeapType::Bot => (),
         }
         Ok(())
     }
@@ -860,7 +859,6 @@ impl Module {
                     self.eq_fns(n1, n2, types)
                 }
                 (HeapType::TypedFunc(_), HeapType::Func) => true,
-                (HeapType::Bot, _) => true,
                 (_, _) => ty1 == ty2,
             }
         };