1 files changed, 23 insertions, 68 deletions
diff --git a/test/passes/Oz_fuzz-exec_all-features.txt b/test/passes/Oz_fuzz-exec_all-features.txt
index f67fc31c3..1d2fe7ed5 100644
--- a/test/passes/Oz_fuzz-exec_all-features.txt
+++ b/test/passes/Oz_fuzz-exec_all-features.txt
@@ -18,19 +18,10 @@
 [LoggingExternalInterface logging 999]
 [fuzz-exec] calling cast-null-anyref-to-gc
 [LoggingExternalInterface logging 0]
-[fuzz-exec] calling br_on_data
-[LoggingExternalInterface logging 1]
-[fuzz-exec] calling br_on_non_data-null
-[fuzz-exec] calling br_on_non_data-data
-[LoggingExternalInterface logging 1]
-[fuzz-exec] calling br_on_non_data-other
 [fuzz-exec] calling br-on_non_null
 [fuzz-exec] calling br-on_non_null-2
 [LoggingExternalInterface logging 1]
 [trap unreachable]
-[fuzz-exec] calling ref-as-data-of-func
-[trap not a data]
-[fuzz-exec] calling ref-as-data-of-data
 [fuzz-exec] calling ref-as-func-of-data
 [trap not a func]
 [fuzz-exec] calling ref-as-func-of-func
@@ -74,7 +65,6 @@
  (type $struct (struct (field (mut i32))))
  (type $i32_=>_none (func (param i32)))
  (type $extendedstruct (struct (field (mut i32)) (field f64)))
- (type $anyref_=>_none (func (param anyref)))
  (type $int_func (func (result i32)))
  (import "fuzzing-support" "log-i32" (func $log (param i32)))
  (export "structs" (func $0))
@@ -83,26 +73,20 @@
  (export "br_on_failed_cast-1" (func $3))
  (export "br_on_failed_cast-2" (func $4))
  (export "cast-null-anyref-to-gc" (func $5))
- (export "br_on_data" (func $7))
- (export "br_on_non_data-null" (func $8))
- (export "br_on_non_data-data" (func $9))
- (export "br_on_non_data-other" (func $8))
- (export "br-on_non_null" (func $8))
- (export "br-on_non_null-2" (func $12))
- (export "ref-as-data-of-func" (func $13))
- (export "ref-as-data-of-data" (func $8))
- (export "ref-as-func-of-data" (func $13))
- (export "ref-as-func-of-func" (func $8))
- (export "cast-on-func" (func $18))
- (export "array-alloc-failure" (func $8))
- (export "init-array-packed" (func $20))
- (export "cast-func-to-struct" (func $13))
- (export "array-copy" (func $23))
- (export "array.init" (func $24))
- (export "array.init-packed" (func $25))
- (export "static-casts" (func $26))
+ (export "br-on_non_null" (func $7))
+ (export "br-on_non_null-2" (func $8))
+ (export "ref-as-func-of-data" (func $9))
+ (export "ref-as-func-of-func" (func $7))
+ (export "cast-on-func" (func $12))
+ (export "array-alloc-failure" (func $7))
+ (export "init-array-packed" (func $14))
+ (export "cast-func-to-struct" (func $9))
+ (export "array-copy" (func $17))
+ (export "array.init" (func $18))
+ (export "array.init-packed" (func $19))
+ (export "static-casts" (func $20))
  (export "static-br_on_cast" (func $2))
- (export "static-br_on_cast_fail" (func $28))
+ (export "static-br_on_cast_fail" (func $22))
  (func $0 (type $void_func) (; has Stack IR ;)
   (local $0 i32)
   (call $log
@@ -202,30 +186,10 @@
    (i32.const 0)
   )
  )
- (func $7 (type $anyref_=>_none) (; has Stack IR ;) (param $0 anyref)
-  (drop
-   (block $data (result (ref data))
-    (drop
-     (br_on_data $data
-      (local.get $0)
-     )
-    )
-    (call $log
-     (i32.const 1)
-    )
-    (struct.new_default $struct)
-   )
-  )
- )
- (func $8 (type $void_func) (; has Stack IR ;)
+ (func $7 (type $void_func) (; has Stack IR ;)
   (nop)
  )
- (func $9 (type $void_func) (; has Stack IR ;)
-  (call $log
-   (i32.const 1)
-  )
- )
- (func $12 (type $void_func) (; has Stack IR ;)
+ (func $8 (type $void_func) (; has Stack IR ;)
   (drop
    (block
     (call $log
@@ -235,12 +199,12 @@
    )
   )
  )
- (func $13 (type $void_func) (; has Stack IR ;)
+ (func $9 (type $void_func) (; has Stack IR ;)
   (drop
    (unreachable)
   )
  )
- (func $18 (type $void_func) (; has Stack IR ;)
+ (func $12 (type $void_func) (; has Stack IR ;)
   (call $log
    (i32.const 0)
   )
@@ -252,7 +216,7 @@
   )
   (unreachable)
  )
- (func $20 (type $int_func) (; has Stack IR ;) (result i32)
+ (func $14 (type $int_func) (; has Stack IR ;) (result i32)
   (array.get_u $bytes
    (array.new $bytes
     (i32.const -43)
@@ -261,7 +225,7 @@
    (i32.const 10)
   )
  )
- (func $23 (type $void_func) (; has Stack IR ;)
+ (func $17 (type $void_func) (; has Stack IR ;)
   (local $0 (ref $bytes))
   (local $1 (ref $bytes))
   (array.set $bytes
@@ -316,7 +280,7 @@
    )
   )
  )
- (func $24 (type $void_func) (; has Stack IR ;)
+ (func $18 (type $void_func) (; has Stack IR ;)
   (local $0 (ref $bytes))
   (call $log
    (array.len
@@ -341,7 +305,7 @@
    )
   )
  )
- (func $25 (type $void_func) (; has Stack IR ;)
+ (func $19 (type $void_func) (; has Stack IR ;)
   (call $log
    (array.get_u $bytes
     (array.init_static $bytes
@@ -351,7 +315,7 @@
    )
   )
  )
- (func $26 (type $void_func) (; has Stack IR ;)
+ (func $20 (type $void_func) (; has Stack IR ;)
   (call $log
    (i32.const 1)
   )
@@ -371,7 +335,7 @@
    (i32.const 0)
   )
  )
- (func $28 (type $void_func) (; has Stack IR ;)
+ (func $22 (type $void_func) (; has Stack IR ;)
   (call $log
    (i32.const -2)
   )
@@ -397,19 +361,10 @@
 [LoggingExternalInterface logging 999]
 [fuzz-exec] calling cast-null-anyref-to-gc
 [LoggingExternalInterface logging 0]
-[fuzz-exec] calling br_on_data
-[LoggingExternalInterface logging 1]
-[fuzz-exec] calling br_on_non_data-null
-[fuzz-exec] calling br_on_non_data-data
-[LoggingExternalInterface logging 1]
-[fuzz-exec] calling br_on_non_data-other
 [fuzz-exec] calling br-on_non_null
 [fuzz-exec] calling br-on_non_null-2
 [LoggingExternalInterface logging 1]
 [trap unreachable]
-[fuzz-exec] calling ref-as-data-of-func
-[trap unreachable]
-[fuzz-exec] calling ref-as-data-of-data
 [fuzz-exec] calling ref-as-func-of-data
 [trap unreachable]
 [fuzz-exec] calling ref-as-func-of-func