update and disable two more subtyping tests

Author: dcodeIO

test/passes/flatten_all-features.txt

@@ -5,7 +5,6 @@
  (type $i32_=>_i32 (func (param i32) (result i32)))
  (type $none_=>_f32 (func (result f32)))
  (type $i64_i64_=>_i64 (func (param i64 i64) (result i64)))
- (type $none_=>_externref (func (result externref)))
  (memory $0 10)
  (table $0 1 1 funcref)
  (elem (i32.const 0) $call-me)
@@ -2376,49 +2375,6 @@
   )
   (unreachable)
  )
- (func $subtype (result externref)
-  (local $0 externref)
-  (local $1 externref)
-  (local $2 externref)
-  (local $3 externref)
-  (local $4 externref)
-  (local $5 externref)
-  (local $6 externref)
-  (block $label0
-   (block $block
-    (local.set $1
-     (ref.null extern)
-    )
-    (br_if $label0
-     (i32.const 0)
-    )
-    (local.set $2
-     (local.get $1)
-    )
-    (local.set $0
-     (local.get $2)
-    )
-    (local.set $3
-     (local.get $0)
-    )
-    (local.set $4
-     (local.get $3)
-    )
-   )
-   (local.set $5
-    (local.get $4)
-   )
-   (local.set $1
-    (local.get $5)
-   )
-  )
-  (local.set $6
-   (local.get $1)
-  )
-  (return
-   (local.get $6)
-  )
- )
 )
 (module
  (type $i64_f32_=>_none (func (param i64 f32)))

test/passes/flatten_all-features.wast

@@ -1020,25 +1020,27 @@
     (return (i32.sub (i32.const 1) (i32.const 2)))
   )
 
+  ;; TODO (GC)
   ;; subtypes
 
   ;; br_if leaves a value on the stack if not taken, which later can be the last
   ;; element of the enclosing innermost block and flow out. So in case br_if
   ;; targets an outer branch whose return type is a supertype of the br_if's
   ;; value type, we need the value to be set into two locals: one with the outer
   ;; block's type, and one with its value type.
-  (func $subtype (result externref) (local $0 externref)
-    (block $label0 (result externref)
-      (block (result externref)
-        (local.tee $0
-          (br_if $label0
-            (ref.null extern)
-            (i32.const 0)
-          )
-        )
-      )
-    )
-  )
+  ;; (func $subtype (result externref)
+  ;;   (local $0 anyref)
+  ;;   (block $label0 (result externref)
+  ;;     (block (result anyref)
+  ;;       (local.tee $0
+  ;;         (br_if $label0
+  ;;           (ref.null extern)
+  ;;           (i32.const 0)
+  ;;         )
+  ;;       )
+  ;;     )
+  ;;   )
+  ;; )
 )
 (module
  (func $0 (param $0 i64) (param $1 f32)

test/passes/optimize-instructions_all-features.txt

@@ -14,7 +14,6 @@
  (type $i32_i32_f64_f64_=>_none (func (param i32 i32 f64 f64)))
  (type $i32_i64_f64_i32_=>_none (func (param i32 i64 f64 i32)))
  (type $none_=>_f64 (func (result f64)))
- (type $none_=>_externref (func (result externref)))
  (memory $0 0)
  (export "load-off-2" (func $load-off-2))
  (func $f (param $i1 i32) (param $i2 i64)
@@ -3712,9 +3711,6 @@
    (unreachable)
   )
  )
- (func $if-arms-subtype (result externref)
-  (ref.null extern)
- )
  (func $optimize-boolean-context (param $x i32) (param $y i32)
   (if
    (local.get $x)

test/passes/optimize-instructions_all-features.wast

@@ -4207,14 +4207,15 @@
       (unreachable)
     )
   )
+  ;; TODO (GC)
   ;; Tests when if arms are subtype of if's type
-  (func $if-arms-subtype (result externref)
-    (if (result externref)
-      (i32.const 0)
-      (ref.null extern)
-      (ref.null extern)
-    )
-  )
+  ;; (func $if-arms-subtype (result anyref)
+  ;;   (if (result anyref)
+  ;;     (i32.const 0)
+  ;;     (ref.null extern)
+  ;;     (ref.null func)
+  ;;   )
+  ;; )
   (func $optimize-boolean-context (param $x i32) (param $y i32)
     ;; 0 - x   ==>   x
     (if