2 files changed, 16 insertions, 2 deletions
diff --git a/src/parser/contexts.h b/src/parser/contexts.h
index 485c596e7..bf6c291e7 100644
--- a/src/parser/contexts.h
+++ b/src/parser/contexts.h
@@ -395,6 +395,8 @@ struct NullInstrParserCtx {
   Result<> makeRefEq(Index) { return Ok{}; }
   Result<> makeRefI31(Index) { return Ok{}; }
   Result<> makeI31Get(Index, bool) { return Ok{}; }
+  template<typename TypeT> Result<> makeRefTest(Index, TypeT) { return Ok{}; }
+  template<typename TypeT> Result<> makeRefCast(Index, TypeT) { return Ok{}; }
 
   template<typename HeapTypeT> Result<> makeStructNew(Index, HeapTypeT) {
     return Ok{};
@@ -1280,6 +1282,14 @@ struct ParseDefsCtx : TypeParserCtx<ParseDefsCtx> {
     return withLoc(pos, irBuilder.makeI31Get(signed_));
   }
 
+  Result<> makeRefTest(Index pos, Type type) {
+    return withLoc(pos, irBuilder.makeRefTest(type));
+  }
+
+  Result<> makeRefCast(Index pos, Type type) {
+    return withLoc(pos, irBuilder.makeRefCast(type));
+  }
+
   Result<> makeStructNew(Index pos, HeapType type) {
     return withLoc(pos, irBuilder.makeStructNew(type));
   }
diff --git a/src/parser/parsers.h b/src/parser/parsers.h
index 0641e941c..6b6bb0aa5 100644
--- a/src/parser/parsers.h
+++ b/src/parser/parsers.h
@@ -1303,11 +1303,15 @@ template<typename Ctx> Result<> makeI31Get(Ctx& ctx, Index pos, bool signed_) {
 }
 
 template<typename Ctx> Result<> makeRefTest(Ctx& ctx, Index pos) {
-  return ctx.in.err("unimplemented instruction");
+  auto type = reftype(ctx);
+  CHECK_ERR(type);
+  return ctx.makeRefTest(pos, *type);
 }
 
 template<typename Ctx> Result<> makeRefCast(Ctx& ctx, Index pos) {
-  return ctx.in.err("unimplemented instruction");
+  auto type = reftype(ctx);
+  CHECK_ERR(type);
+  return ctx.makeRefCast(pos, *type);
 }
 
 template<typename Ctx> Result<> makeBrOnNull(Ctx& ctx, Index pos, bool onFail) {