Update tests

Author: stevenfontanella

test/lit/passes/optimize-instructions-desc.wast

@@ -513,11 +513,9 @@
   ;; NTRAP:      (func $cast-desc-eq-weaker-nondesc-child-effects (type $14) (param $ref anyref) (param $desc (ref $sub.desc))
   ;; NTRAP-NEXT:  (drop
   ;; NTRAP-NEXT:   (ref.cast_desc_eq (ref $sub)
-  ;; NTRAP-NEXT:    (ref.as_non_null
-  ;; NTRAP-NEXT:     (block (result anyref)
-  ;; NTRAP-NEXT:      (call $effect)
-  ;; NTRAP-NEXT:      (local.get $ref)
-  ;; NTRAP-NEXT:     )
+  ;; NTRAP-NEXT:    (block (result anyref)
+  ;; NTRAP-NEXT:     (call $effect)
+  ;; NTRAP-NEXT:     (local.get $ref)
   ;; NTRAP-NEXT:    )
   ;; NTRAP-NEXT:    (block (result (ref $sub.desc))
   ;; NTRAP-NEXT:     (call $effect)
@@ -1407,21 +1405,17 @@
   ;; CHECK-NEXT: )
   ;; NTRAP:      (func $ref.cast_desc_eq-ref.as_non_null (type $4)
   ;; NTRAP-NEXT:  (local $null (ref null $struct))
-  ;; NTRAP-NEXT:  (local $1 (ref $struct))
-  ;; NTRAP-NEXT:  (local $2 (ref null $desc))
+  ;; NTRAP-NEXT:  (local $1 (ref null $desc))
   ;; NTRAP-NEXT:  (drop
   ;; NTRAP-NEXT:   (block (result (ref $struct))
   ;; NTRAP-NEXT:    (local.set $1
-  ;; NTRAP-NEXT:     (ref.as_non_null
-  ;; NTRAP-NEXT:      (local.get $null)
-  ;; NTRAP-NEXT:     )
-  ;; NTRAP-NEXT:    )
-  ;; NTRAP-NEXT:    (local.set $2
   ;; NTRAP-NEXT:     (block (result (ref null $desc))
   ;; NTRAP-NEXT:      (return)
   ;; NTRAP-NEXT:     )
   ;; NTRAP-NEXT:    )
-  ;; NTRAP-NEXT:    (local.get $1)
+  ;; NTRAP-NEXT:    (ref.as_non_null
+  ;; NTRAP-NEXT:     (local.get $null)
+  ;; NTRAP-NEXT:    )
   ;; NTRAP-NEXT:   )
   ;; NTRAP-NEXT:  )
   ;; NTRAP-NEXT:  (drop

test/lit/passes/optimize-instructions-gc-tnh.wast

@@ -879,11 +879,7 @@
   )
 
   ;; TNH:      (func $select.unreachable.child.flip (type $6) (param $x (ref $struct)) (result (ref $struct))
-  ;; TNH-NEXT:  (select
-  ;; TNH-NEXT:   (local.get $x)
-  ;; TNH-NEXT:   (unreachable)
-  ;; TNH-NEXT:   (i32.const 1)
-  ;; TNH-NEXT:  )
+  ;; TNH-NEXT:  (local.get $x)
   ;; TNH-NEXT: )
   ;; NO_TNH:      (func $select.unreachable.child.flip (type $6) (param $x (ref $struct)) (result (ref $struct))
   ;; NO_TNH-NEXT:  (select

test/lit/passes/vacuum-tnh.wast

@@ -19,9 +19,7 @@
   (type $struct (struct (field (mut i32))))
 
   ;; YESTNH:      (func $drop (type $4) (param $x i32) (param $y anyref)
-  ;; YESTNH-NEXT:  (drop
-  ;; YESTNH-NEXT:   (unreachable)
-  ;; YESTNH-NEXT:  )
+  ;; YESTNH-NEXT:  (nop)
   ;; YESTNH-NEXT: )
   ;; NO_TNH:      (func $drop (type $4) (param $x i32) (param $y anyref)
   ;; NO_TNH-NEXT:  (drop
@@ -184,7 +182,7 @@
   )
 
   ;; YESTNH:      (func $toplevel (type $0)
-  ;; YESTNH-NEXT:  (unreachable)
+  ;; YESTNH-NEXT:  (nop)
   ;; YESTNH-NEXT: )
   ;; NO_TNH:      (func $toplevel (type $0)
   ;; NO_TNH-NEXT:  (unreachable)