Rewrite test to work with function references and without GC

Author: fitzgen

test/core/br_on_null.wast

@@ -64,3 +64,46 @@
 
 (assert_return (invoke "args-null" (i32.const 3)) (i32.const 3))
 (assert_return (invoke "args-f" (i32.const 3)) (i32.const 9))
+
+;; https://github.com/WebAssembly/gc/issues/516
+(assert_invalid
+ (module
+   (type $ty (func))
+
+   (func $ty_ref_to_func_ref (param (ref null $ty)) (result funcref)
+     local.get 0
+   )
+
+   (func (param funcref) (result funcref)
+     ref.null $ty
+     local.get 0
+
+     ;; This instruction is typed `[funcref funcref] -> [funcref (ref
+     ;; func)]`. The stack coming into this instruction is `[(ref null $ty)
+     ;; funcref]` which matches because of `(ref null $ty) <: funcref`. However,
+     ;; that subtyping relation doesn't mean that this instruction can *push* a
+     ;; `(ref null $ty)`. The label type effectively erases the `(ref null
+     ;; $ty)`, turning it into an `funcref`. Finally, a type mismatch error
+     ;; should be reported at the `call` instruction below, which expects a
+     ;; `(ref null $ty)` but is given the `funcref` (that is "actually" a `(ref
+     ;; null $ty)`).
+     ;;
+     ;; This tests that validators are correctly doing
+     ;;
+     ;;     pop_operands(label_types)
+     ;;     push_operands(label_types)
+     ;;
+     ;; rather than incorrectly doing either
+     ;;
+     ;;     push_operands(pop_operands(label_types))
+     ;;
+     ;; or just inspecting the types on the stack without any pushing or
+     ;; popping, neither of which handle subtyping correctly.
+     br_on_null 0
+
+     drop
+     call $ty_ref_to_func_ref
+   )
+ )
+"type mismatch"
+)

test/core/gc/br_on_cast_fail.wast

@@ -280,24 +280,3 @@
   )
   "type mismatch"
 )
-
-;; https://github.com/WebAssembly/gc/issues/516
-(assert_invalid
-  (module
-    (func (param anyref) (result anyref)
-      ref.null struct
-      local.get 0
-      ;; This instruction is typed `[anyref anyref] -> [anyref (ref any)]`. The stack
-      ;; coming into this instruction is `[structref anyref]` which matches because of
-      ;; `structref <: anyref`. However, that subtyping relation doesn't mean that this
-      ;; instruction can *push* a `structref`. The label type effectively erases the
-      ;; `structref`, turning it into an `anyref`. Finally, a type mismatch error should
-      ;; be reported at the `br_on_cast_fail` instruction, which expects a `structref`
-      ;; but is given the `anyref` (that is "actually" a `structref`).
-      br_on_null 0
-      drop
-      br_on_cast_fail 0  structref structref
-    )
-  )
-  "type mismatch"
-)