Remove externref (#4633)

Remove `Type::externref` and `HeapType::ext` and replace them with uses of
anyref and any, respectively, now that we have unified these types in the GC
proposal. For backwards compatibility, continue to parse `extern` and
`externref` and maintain their relevant C API functions.

1 files changed, 89 insertions, 91 deletions

diff --git a/test/reference-types.wast.fromBinary.noDebugInfo b/test/reference-types.wast.fromBinary.noDebugInfo
index 264539142..42ad4026a 100644
--- a/test/reference-types.wast.fromBinary.noDebugInfo
+++ b/test/reference-types.wast.fromBinary.noDebugInfo
@@ -3,18 +3,16 @@
  (type $anyref_=>_none (func (param anyref)))
  (type $funcref_=>_none (func (param funcref)))
  (type $none_=>_funcref (func (result funcref)))
- (type $externref_=>_none (func (param externref)))
  (type $none_=>_none (func))
- (type $none_=>_externref (func (result externref)))
  (type $i32_=>_none (func (param i32)))
- (type $externref_=>_funcref (func (param externref) (result funcref)))
- (import "env" "import_global" (global $gimport$0 externref))
- (import "env" "import_func" (func $fimport$0 (param externref) (result funcref)))
- (global $global$0 (mut externref) (ref.null extern))
+ (type $anyref_=>_funcref (func (param anyref) (result funcref)))
+ (import "env" "import_global" (global $gimport$0 anyref))
+ (import "env" "import_func" (func $fimport$0 (param anyref) (result funcref)))
+ (global $global$0 (mut anyref) (ref.null any))
  (global $global$1 (mut funcref) (ref.null func))
  (global $global$2 (mut funcref) (ref.func $3))
  (global $global$3 (mut anyref) (ref.null any))
- (global $global$4 (mut anyref) (ref.null extern))
+ (global $global$4 (mut anyref) (ref.null any))
  (global $global$5 (mut anyref) (ref.null func))
  (global $global$6 (mut anyref) (ref.func $3))
  (table $0 3 3 funcref)
@@ -23,7 +21,7 @@
  (tag $tag$0 (param i32))
  (export "export_func" (func $fimport$0))
  (export "export_global" (global $gimport$0))
- (func $0 (param $0 externref)
+ (func $0 (param $0 anyref)
   (nop)
  )
  (func $1 (param $0 funcref)
@@ -36,9 +34,9 @@
   (nop)
  )
  (func $4
-  (local $0 externref)
-  (local $1 funcref)
-  (local $2 anyref)
+  (local $0 anyref)
+  (local $1 anyref)
+  (local $2 funcref)
   (local.set $0
    (local.get $0)
   )
@@ -46,48 +44,48 @@
    (global.get $global$0)
   )
   (local.set $0
-   (ref.null extern)
+   (ref.null any)
   )
-  (local.set $1
-   (local.get $1)
+  (local.set $2
+   (local.get $2)
   )
-  (local.set $1
+  (local.set $2
    (global.get $global$1)
   )
-  (local.set $1
+  (local.set $2
    (ref.null func)
   )
-  (local.set $1
+  (local.set $2
    (ref.func $3)
   )
-  (local.set $2
-   (local.get $2)
+  (local.set $1
+   (local.get $1)
   )
-  (local.set $2
+  (local.set $1
    (global.get $global$3)
   )
-  (local.set $2
+  (local.set $1
    (ref.null any)
   )
-  (local.set $2
+  (local.set $1
    (local.get $0)
   )
-  (local.set $2
+  (local.set $1
    (global.get $global$0)
   )
-  (local.set $2
-   (ref.null extern)
+  (local.set $1
+   (ref.null any)
   )
-  (local.set $2
-   (local.get $1)
+  (local.set $1
+   (local.get $2)
   )
-  (local.set $2
+  (local.set $1
    (global.get $global$1)
   )
-  (local.set $2
+  (local.set $1
    (ref.null func)
   )
-  (local.set $2
+  (local.set $1
    (ref.func $3)
   )
   (global.set $global$0
@@ -97,13 +95,13 @@
    (local.get $0)
   )
   (global.set $global$0
-   (ref.null extern)
+   (ref.null any)
   )
   (global.set $global$1
    (global.get $global$1)
   )
   (global.set $global$1
-   (local.get $1)
+   (local.get $2)
   )
   (global.set $global$1
    (ref.null func)
@@ -115,7 +113,7 @@
    (global.get $global$3)
   )
   (global.set $global$3
-   (local.get $2)
+   (local.get $1)
   )
   (global.set $global$3
    (ref.null any)
@@ -127,13 +125,13 @@
    (local.get $0)
   )
   (global.set $global$3
-   (ref.null extern)
+   (ref.null any)
   )
   (global.set $global$3
    (global.get $global$1)
   )
   (global.set $global$3
-   (local.get $1)
+   (local.get $2)
   )
   (global.set $global$3
    (ref.null func)
@@ -148,10 +146,10 @@
    (global.get $global$0)
   )
   (call $0
-   (ref.null extern)
+   (ref.null any)
   )
   (call $1
-   (local.get $1)
+   (local.get $2)
   )
   (call $1
    (global.get $global$1)
@@ -163,7 +161,7 @@
    (ref.func $3)
   )
   (call $2
-   (local.get $2)
+   (local.get $1)
   )
   (call $2
    (global.get $global$3)
@@ -178,10 +176,10 @@
    (global.get $global$0)
   )
   (call $2
-   (ref.null extern)
+   (ref.null any)
   )
   (call $2
-   (local.get $1)
+   (local.get $2)
   )
   (call $2
    (global.get $global$1)
@@ -192,20 +190,20 @@
   (call $2
    (ref.func $3)
   )
-  (call_indirect $0 (type $externref_=>_none)
+  (call_indirect $0 (type $anyref_=>_none)
    (local.get $0)
    (i32.const 0)
   )
-  (call_indirect $0 (type $externref_=>_none)
+  (call_indirect $0 (type $anyref_=>_none)
    (global.get $global$0)
    (i32.const 0)
   )
-  (call_indirect $0 (type $externref_=>_none)
-   (ref.null extern)
+  (call_indirect $0 (type $anyref_=>_none)
+   (ref.null any)
    (i32.const 0)
   )
   (call_indirect $0 (type $funcref_=>_none)
-   (local.get $1)
+   (local.get $2)
    (i32.const 1)
   )
   (call_indirect $0 (type $funcref_=>_none)
@@ -221,7 +219,7 @@
    (i32.const 1)
   )
   (call_indirect $0 (type $anyref_=>_none)
-   (local.get $2)
+   (local.get $1)
    (i32.const 3)
   )
   (call_indirect $0 (type $anyref_=>_none)
@@ -241,11 +239,11 @@
    (i32.const 3)
   )
   (call_indirect $0 (type $anyref_=>_none)
-   (ref.null extern)
+   (ref.null any)
    (i32.const 3)
   )
   (call_indirect $0 (type $anyref_=>_none)
-   (local.get $1)
+   (local.get $2)
    (i32.const 3)
   )
   (call_indirect $0 (type $anyref_=>_none)
@@ -261,7 +259,7 @@
    (i32.const 3)
   )
   (drop
-   (block $label$1 (result externref)
+   (block $label$1 (result anyref)
     (br_if $label$1
      (local.get $0)
      (i32.const 1)
@@ -269,7 +267,7 @@
    )
   )
   (drop
-   (block $label$2 (result externref)
+   (block $label$2 (result anyref)
     (br_if $label$2
      (global.get $global$0)
      (i32.const 1)
@@ -277,9 +275,9 @@
    )
   )
   (drop
-   (block $label$3 (result externref)
+   (block $label$3 (result anyref)
     (br_if $label$3
-     (ref.null extern)
+     (ref.null any)
      (i32.const 1)
     )
    )
@@ -287,7 +285,7 @@
   (drop
    (block $label$4 (result funcref)
     (br_if $label$4
-     (local.get $1)
+     (local.get $2)
      (i32.const 1)
     )
    )
@@ -319,7 +317,7 @@
   (drop
    (block $label$8 (result anyref)
     (br_if $label$8
-     (local.get $2)
+     (local.get $1)
      (i32.const 1)
     )
    )
@@ -351,7 +349,7 @@
   (drop
    (block $label$12 (result anyref)
     (br_if $label$12
-     (local.get $1)
+     (local.get $2)
      (i32.const 1)
     )
    )
@@ -359,7 +357,7 @@
   (drop
    (block $label$13 (result anyref)
     (br_if $label$13
-     (ref.null extern)
+     (ref.null any)
      (i32.const 1)
     )
    )
@@ -381,23 +379,23 @@
    )
   )
   (drop
-   (loop $label$16 (result externref)
+   (loop $label$16 (result anyref)
     (local.get $0)
    )
   )
   (drop
-   (loop $label$17 (result externref)
+   (loop $label$17 (result anyref)
     (global.get $global$0)
    )
   )
   (drop
-   (loop $label$18 (result externref)
-    (ref.null extern)
+   (loop $label$18 (result anyref)
+    (ref.null any)
    )
   )
   (drop
    (loop $label$19 (result funcref)
-    (local.get $1)
+    (local.get $2)
    )
   )
   (drop
@@ -417,7 +415,7 @@
   )
   (drop
    (loop $label$23 (result anyref)
-    (local.get $2)
+    (local.get $1)
    )
   )
   (drop
@@ -442,12 +440,12 @@
   )
   (drop
    (loop $label$28 (result anyref)
-    (ref.null extern)
+    (ref.null any)
    )
   )
   (drop
    (loop $label$29 (result anyref)
-    (local.get $1)
+    (local.get $2)
    )
   )
   (drop
@@ -466,23 +464,23 @@
    )
   )
   (drop
-   (if (result externref)
+   (if (result anyref)
     (i32.const 1)
     (local.get $0)
-    (ref.null extern)
+    (ref.null any)
    )
   )
   (drop
    (if (result funcref)
     (i32.const 1)
-    (local.get $1)
+    (local.get $2)
     (ref.null func)
    )
   )
   (drop
    (if (result anyref)
     (i32.const 1)
-    (local.get $2)
+    (local.get $1)
     (ref.null any)
    )
   )
@@ -490,13 +488,13 @@
    (if (result anyref)
     (i32.const 1)
     (local.get $0)
-    (local.get $1)
+    (local.get $2)
    )
   )
   (drop
    (if (result anyref)
     (i32.const 1)
-    (ref.null extern)
+    (ref.null any)
     (ref.null func)
    )
   )
@@ -504,11 +502,11 @@
    (if (result anyref)
     (i32.const 1)
     (ref.func $3)
-    (ref.null extern)
+    (ref.null any)
    )
   )
   (drop
-   (try $label$47 (result externref)
+   (try $label$47 (result anyref)
     (do
      (local.get $0)
     )
@@ -516,7 +514,7 @@
      (drop
       (pop i32)
      )
-     (ref.null extern)
+     (ref.null any)
     )
    )
   )
@@ -560,15 +558,15 @@
    )
   )
   (drop
-   (select (result externref)
+   (select (result anyref)
     (local.get $0)
-    (ref.null extern)
+    (ref.null any)
     (i32.const 1)
    )
   )
   (drop
    (select (result funcref)
-    (local.get $1)
+    (local.get $2)
     (ref.null func)
     (i32.const 1)
    )
@@ -583,13 +581,13 @@
   (drop
    (select (result anyref)
     (local.get $0)
-    (local.get $1)
+    (local.get $2)
     (i32.const 1)
    )
   )
   (drop
    (select (result anyref)
-    (local.get $1)
+    (local.get $2)
     (local.get $0)
     (i32.const 1)
    )
@@ -606,12 +604,12 @@
   )
   (drop
    (ref.is_null
-    (ref.null extern)
+    (ref.null any)
    )
   )
   (drop
    (ref.is_null
-    (local.get $1)
+    (local.get $2)
    )
   )
   (drop
@@ -631,7 +629,7 @@
   )
   (drop
    (ref.is_null
-    (local.get $2)
+    (local.get $1)
    )
   )
   (drop
@@ -645,15 +643,15 @@
    )
   )
  )
- (func $5 (result externref)
-  (local $0 externref)
+ (func $5 (result anyref)
+  (local $0 anyref)
   (local.get $0)
  )
- (func $6 (result externref)
+ (func $6 (result anyref)
   (global.get $global$0)
  )
- (func $7 (result externref)
-  (ref.null extern)
+ (func $7 (result anyref)
+  (ref.null any)
  )
  (func $8 (result funcref)
   (local $0 funcref)
@@ -679,14 +677,14 @@
   (ref.null any)
  )
  (func $15 (result anyref)
-  (local $0 externref)
+  (local $0 anyref)
   (local.get $0)
  )
  (func $16 (result anyref)
   (global.get $global$0)
  )
  (func $17 (result anyref)
-  (ref.null extern)
+  (ref.null any)
  )
  (func $18 (result anyref)
   (local $0 funcref)
@@ -701,8 +699,8 @@
  (func $21 (result anyref)
   (ref.func $3)
  )
- (func $22 (result externref)
-  (local $0 externref)
+ (func $22 (result anyref)
+  (local $0 anyref)
   (return
    (local.get $0)
   )
@@ -720,7 +718,7 @@
   )
  )
  (func $25 (result anyref)
-  (local $0 externref)
+  (local $0 anyref)
   (local $1 funcref)
   (return
    (local.get $0)