1 files changed, 99 insertions, 97 deletions
diff --git a/test/reference-types.wast.fromBinary b/test/reference-types.wast.fromBinary
index 37a57ac78..68ed3e63d 100644
--- a/test/reference-types.wast.fromBinary
+++ b/test/reference-types.wast.fromBinary
@@ -3,25 +3,27 @@
  (type $sig_anyref (func (param anyref)))
  (type $sig_funcref (func (param funcref)))
  (type $none_=>_funcref (func (result funcref)))
+ (type $sig_eqref (func (param eqref)))
  (type $none_=>_none (func))
+ (type $none_=>_eqref (func (result eqref)))
  (type $i32_=>_none (func (param i32)))
- (type $anyref_=>_funcref (func (param anyref) (result funcref)))
- (import "env" "import_global" (global $import_global anyref))
- (import "env" "import_func" (func $import_func (param anyref) (result funcref)))
- (global $global_externref (mut anyref) (ref.null any))
+ (type $eqref_=>_funcref (func (param eqref) (result funcref)))
+ (import "env" "import_global" (global $import_global eqref))
+ (import "env" "import_func" (func $import_func (param eqref) (result funcref)))
+ (global $global_eqref (mut eqref) (ref.null eq))
  (global $global_funcref (mut funcref) (ref.null func))
  (global $global_funcref_func (mut funcref) (ref.func $foo))
  (global $global_anyref (mut anyref) (ref.null any))
- (global $global_anyref2 (mut anyref) (ref.null any))
+ (global $global_anyref2 (mut anyref) (ref.null eq))
  (global $global_anyref3 (mut anyref) (ref.null func))
  (global $global_anyref4 (mut anyref) (ref.func $foo))
  (table $0 3 3 funcref)
- (elem (i32.const 0) $take_externref $take_funcref $take_anyref)
+ (elem (i32.const 0) $take_eqref $take_funcref $take_anyref)
  (elem declare func $foo $ref-taken-but-not-in-table)
  (tag $tag$0 (param i32))
  (export "export_func" (func $import_func))
  (export "export_global" (global $import_global))
- (func $take_externref (param $0 anyref)
+ (func $take_eqref (param $0 eqref)
   (nop)
  )
  (func $take_funcref (param $0 funcref)
@@ -34,17 +36,17 @@
   (nop)
  )
  (func $test
-  (local $local_externref anyref)
-  (local $local_anyref anyref)
+  (local $local_eqref eqref)
   (local $local_funcref funcref)
-  (local.set $local_externref
-   (local.get $local_externref)
+  (local $local_anyref anyref)
+  (local.set $local_eqref
+   (local.get $local_eqref)
   )
-  (local.set $local_externref
-   (global.get $global_externref)
+  (local.set $local_eqref
+   (global.get $global_eqref)
   )
-  (local.set $local_externref
-   (ref.null any)
+  (local.set $local_eqref
+   (ref.null eq)
   )
   (local.set $local_funcref
    (local.get $local_funcref)
@@ -68,13 +70,13 @@
    (ref.null any)
   )
   (local.set $local_anyref
-   (local.get $local_externref)
+   (local.get $local_eqref)
   )
   (local.set $local_anyref
-   (global.get $global_externref)
+   (global.get $global_eqref)
   )
   (local.set $local_anyref
-   (ref.null any)
+   (ref.null eq)
   )
   (local.set $local_anyref
    (local.get $local_funcref)
@@ -88,14 +90,14 @@
   (local.set $local_anyref
    (ref.func $foo)
   )
-  (global.set $global_externref
-   (global.get $global_externref)
+  (global.set $global_eqref
+   (global.get $global_eqref)
   )
-  (global.set $global_externref
-   (local.get $local_externref)
+  (global.set $global_eqref
+   (local.get $local_eqref)
   )
-  (global.set $global_externref
-   (ref.null any)
+  (global.set $global_eqref
+   (ref.null eq)
   )
   (global.set $global_funcref
    (global.get $global_funcref)
@@ -119,13 +121,13 @@
    (ref.null any)
   )
   (global.set $global_anyref
-   (global.get $global_externref)
+   (global.get $global_eqref)
   )
   (global.set $global_anyref
-   (local.get $local_externref)
+   (local.get $local_eqref)
   )
   (global.set $global_anyref
-   (ref.null any)
+   (ref.null eq)
   )
   (global.set $global_anyref
    (global.get $global_funcref)
@@ -139,14 +141,14 @@
   (global.set $global_anyref
    (ref.func $foo)
   )
-  (call $take_externref
-   (local.get $local_externref)
+  (call $take_eqref
+   (local.get $local_eqref)
   )
-  (call $take_externref
-   (global.get $global_externref)
+  (call $take_eqref
+   (global.get $global_eqref)
   )
-  (call $take_externref
-   (ref.null any)
+  (call $take_eqref
+   (ref.null eq)
   )
   (call $take_funcref
    (local.get $local_funcref)
@@ -170,13 +172,13 @@
    (ref.null any)
   )
   (call $take_anyref
-   (local.get $local_externref)
+   (local.get $local_eqref)
   )
   (call $take_anyref
-   (global.get $global_externref)
+   (global.get $global_eqref)
   )
   (call $take_anyref
-   (ref.null any)
+   (ref.null eq)
   )
   (call $take_anyref
    (local.get $local_funcref)
@@ -190,16 +192,16 @@
   (call $take_anyref
    (ref.func $foo)
   )
-  (call_indirect $0 (type $sig_anyref)
-   (local.get $local_externref)
+  (call_indirect $0 (type $sig_eqref)
+   (local.get $local_eqref)
    (i32.const 0)
   )
-  (call_indirect $0 (type $sig_anyref)
-   (global.get $global_externref)
+  (call_indirect $0 (type $sig_eqref)
+   (global.get $global_eqref)
    (i32.const 0)
   )
-  (call_indirect $0 (type $sig_anyref)
-   (ref.null any)
+  (call_indirect $0 (type $sig_eqref)
+   (ref.null eq)
    (i32.const 0)
   )
   (call_indirect $0 (type $sig_funcref)
@@ -231,15 +233,15 @@
    (i32.const 3)
   )
   (call_indirect $0 (type $sig_anyref)
-   (local.get $local_externref)
+   (local.get $local_eqref)
    (i32.const 3)
   )
   (call_indirect $0 (type $sig_anyref)
-   (global.get $global_externref)
+   (global.get $global_eqref)
    (i32.const 3)
   )
   (call_indirect $0 (type $sig_anyref)
-   (ref.null any)
+   (ref.null eq)
    (i32.const 3)
   )
   (call_indirect $0 (type $sig_anyref)
@@ -259,25 +261,25 @@
    (i32.const 3)
   )
   (drop
-   (block $label$1 (result anyref)
+   (block $label$1 (result eqref)
     (br_if $label$1
-     (local.get $local_externref)
+     (local.get $local_eqref)
      (i32.const 1)
     )
    )
   )
   (drop
-   (block $label$2 (result anyref)
+   (block $label$2 (result eqref)
     (br_if $label$2
-     (global.get $global_externref)
+     (global.get $global_eqref)
      (i32.const 1)
     )
    )
   )
   (drop
-   (block $label$3 (result anyref)
+   (block $label$3 (result eqref)
     (br_if $label$3
-     (ref.null any)
+     (ref.null eq)
      (i32.const 1)
     )
    )
@@ -341,7 +343,7 @@
   (drop
    (block $label$11 (result anyref)
     (br_if $label$11
-     (local.get $local_externref)
+     (local.get $local_eqref)
      (i32.const 1)
     )
    )
@@ -357,7 +359,7 @@
   (drop
    (block $label$13 (result anyref)
     (br_if $label$13
-     (ref.null any)
+     (ref.null eq)
      (i32.const 1)
     )
    )
@@ -379,18 +381,18 @@
    )
   )
   (drop
-   (loop $label$16 (result anyref)
-    (local.get $local_externref)
+   (loop $label$16 (result eqref)
+    (local.get $local_eqref)
    )
   )
   (drop
-   (loop $label$17 (result anyref)
-    (global.get $global_externref)
+   (loop $label$17 (result eqref)
+    (global.get $global_eqref)
    )
   )
   (drop
-   (loop $label$18 (result anyref)
-    (ref.null any)
+   (loop $label$18 (result eqref)
+    (ref.null eq)
    )
   )
   (drop
@@ -430,17 +432,17 @@
   )
   (drop
    (loop $label$26 (result anyref)
-    (local.get $local_externref)
+    (local.get $local_eqref)
    )
   )
   (drop
    (loop $label$27 (result anyref)
-    (global.get $global_externref)
+    (global.get $global_eqref)
    )
   )
   (drop
    (loop $label$28 (result anyref)
-    (ref.null any)
+    (ref.null eq)
    )
   )
   (drop
@@ -464,10 +466,10 @@
    )
   )
   (drop
-   (if (result anyref)
+   (if (result eqref)
     (i32.const 1)
-    (local.get $local_externref)
-    (ref.null any)
+    (local.get $local_eqref)
+    (ref.null eq)
    )
   )
   (drop
@@ -487,14 +489,14 @@
   (drop
    (if (result anyref)
     (i32.const 1)
-    (local.get $local_externref)
+    (local.get $local_eqref)
     (local.get $local_funcref)
    )
   )
   (drop
    (if (result anyref)
     (i32.const 1)
-    (ref.null any)
+    (ref.null eq)
     (ref.null func)
    )
   )
@@ -502,19 +504,19 @@
    (if (result anyref)
     (i32.const 1)
     (ref.func $foo)
-    (ref.null any)
+    (ref.null eq)
    )
   )
   (drop
-   (try $label$47 (result anyref)
+   (try $label$47 (result eqref)
     (do
-     (local.get $local_externref)
+     (local.get $local_eqref)
     )
     (catch $tag$0
      (drop
       (pop i32)
      )
-     (ref.null any)
+     (ref.null eq)
     )
    )
   )
@@ -534,7 +536,7 @@
   (drop
    (try $label$53 (result anyref)
     (do
-     (local.get $local_externref)
+     (local.get $local_eqref)
     )
     (catch $tag$0
      (drop
@@ -553,14 +555,14 @@
      (drop
       (pop i32)
      )
-     (local.get $local_externref)
+     (local.get $local_eqref)
     )
    )
   )
   (drop
-   (select (result anyref)
-    (local.get $local_externref)
-    (ref.null any)
+   (select (result eqref)
+    (local.get $local_eqref)
+    (ref.null eq)
     (i32.const 1)
    )
   )
@@ -580,7 +582,7 @@
   )
   (drop
    (select (result anyref)
-    (local.get $local_externref)
+    (local.get $local_eqref)
     (local.get $local_funcref)
     (i32.const 1)
    )
@@ -588,23 +590,23 @@
   (drop
    (select (result anyref)
     (local.get $local_funcref)
-    (local.get $local_externref)
+    (local.get $local_eqref)
     (i32.const 1)
    )
   )
   (drop
    (ref.is_null
-    (local.get $local_externref)
+    (local.get $local_eqref)
    )
   )
   (drop
    (ref.is_null
-    (global.get $global_externref)
+    (global.get $global_eqref)
    )
   )
   (drop
    (ref.is_null
-    (ref.null any)
+    (ref.null eq)
    )
   )
   (drop
@@ -643,15 +645,15 @@
    )
   )
  )
- (func $return_externref_local (result anyref)
-  (local $local_externref anyref)
-  (local.get $local_externref)
+ (func $return_eqref_local (result eqref)
+  (local $local_eqref eqref)
+  (local.get $local_eqref)
  )
- (func $return_externref_global (result anyref)
-  (global.get $global_externref)
+ (func $return_eqref_global (result eqref)
+  (global.get $global_eqref)
  )
- (func $return_externref_null (result anyref)
-  (ref.null any)
+ (func $return_eqref_null (result eqref)
+  (ref.null eq)
  )
  (func $return_funcref_local (result funcref)
   (local $local_funcref funcref)
@@ -677,14 +679,14 @@
   (ref.null any)
  )
  (func $return_anyref2 (result anyref)
-  (local $local_externref anyref)
-  (local.get $local_externref)
+  (local $local_eqref eqref)
+  (local.get $local_eqref)
  )
  (func $return_anyref3 (result anyref)
-  (global.get $global_externref)
+  (global.get $global_eqref)
  )
  (func $return_anyref4 (result anyref)
-  (ref.null any)
+  (ref.null eq)
  )
  (func $return_anyref5 (result anyref)
   (local $local_funcref funcref)
@@ -699,10 +701,10 @@
  (func $return_anyref8 (result anyref)
   (ref.func $foo)
  )
- (func $returns_externref (result anyref)
-  (local $local_externref anyref)
+ (func $returns_eqref (result eqref)
+  (local $local_eqref eqref)
   (return
-   (local.get $local_externref)
+   (local.get $local_eqref)
   )
  )
  (func $returns_funcref (result funcref)
@@ -718,10 +720,10 @@
   )
  )
  (func $returns_anyref2 (result anyref)
-  (local $local_externref anyref)
+  (local $local_eqref eqref)
   (local $local_funcref funcref)
   (return
-   (local.get $local_externref)
+   (local.get $local_eqref)
   )
  )
  (func $ref-user