[wast] Rename extern.internalize and extern.externalize (#1298)

* [wast] Rename extern.internalize and extern.externalize.

Due to a recent change in wasm-gc, extern.internalize was renamed
to any.convert_extern and extern.externalize to extern.convert_any.

* Update submodule testsuite

* Update wast files to align with new tests.

Author: jpages

crates/wast/src/core/expr.rs

@@ -649,8 +649,8 @@ instructions! {
         BrOnCastFail(Box<BrOnCastFail<'a>>) : [] : "br_on_cast_fail",
 
         // gc proposal extern/any coercion operations
-        ExternInternalize : [0xfb, 0x1a] : "extern.internalize",
-        ExternExternalize : [0xfb, 0x1b] : "extern.externalize",
+        AnyConvertExtern : [0xfb, 0x1a] : "any.convert_extern",
+        ExternConvertAny : [0xfb, 0x1b] : "extern.convert_any",
 
         I32Const(i32) : [0x41] : "i32.const",
         I64Const(i64) : [0x42] : "i64.const",

tests/roundtrip.rs

@@ -186,9 +186,13 @@ fn skip_validation(test: &Path) -> bool {
         "/proposals/gc/ref_test.wast",
         "/proposals/gc/struct.wast",
         "/proposals/gc/type-subtyping.wast",
+        "/proposals/exception-handling/try_table.wast",
+        "/proposals/exception-handling/throw_ref.wast",
+        "/proposals/exception-handling/ref_null.wast",
         "/exnref/exnref.wast",
         "/exnref/throw_ref.wast",
         "/exnref/try_table.wast",
+        "obsolete-keywords.wast",
     ];
     let test_path = test.to_str().unwrap().replace("\\", "/"); // for windows paths
     if broken.iter().any(|x| test_path.contains(x)) {

tests/snapshots/testsuite/comments.wast/4.print

@@ -0,0 +1,19 @@
+(module
+  (type (;0;) (func (result i32)))
+  (func (;0;) (type 0) (result i32)
+    i32.const 1
+    i32.const 2
+    return
+  )
+  (func (;1;) (type 0) (result i32)
+    i32.const 1
+  )
+  (func (;2;) (type 0) (result i32)
+    i32.const 1
+    i32.const 2
+    return
+  )
+  (export "f1" (func 0))
+  (export "f2" (func 1))
+  (export "f3" (func 2))
+)

tests/snapshots/testsuite/if.wast/0.print

@@ -862,6 +862,17 @@
     drop
     drop
   )
+  (func (;52;) (type $block-sig-1)
+    i32.const 0
+    if ;; label = @1
+    else
+    end
+    i32.const 1
+    i32.eqz
+    if ;; label = @1
+    else
+    end
+  )
   (table (;0;) 1 1 funcref)
   (memory (;0;) 1)
   (global $a (;0;) (mut i32) i32.const 10)
@@ -914,5 +925,6 @@
   (export "add64_u_with_carry" (func $add64_u_with_carry))
   (export "add64_u_saturated" (func $add64_u_saturated))
   (export "type-use" (func 51))
+  (export "atypical-condition" (func 52))
   (elem (;0;) (i32.const 0) func $func)
 )

tests/snapshots/testsuite/proposals/exception-handling/rethrow.wast/0.print

@@ -0,0 +1,9 @@
+(module
+  (type (;0;) (func))
+  (func (;0;) (type 0)
+    throw 0
+  )
+  (tag (;0;) (type 0))
+  (export "e0" (tag 0))
+  (export "throw" (func 0))
+)

tests/snapshots/testsuite/proposals/exception-handling/try_table.wast/0.print

@@ -862,6 +862,17 @@
     drop
     drop
   )
+  (func (;52;) (type $block-sig-1)
+    i32.const 0
+    if ;; label = @1
+    else
+    end
+    i32.const 1
+    i32.eqz
+    if ;; label = @1
+    else
+    end
+  )
   (table (;0;) 1 1 funcref)
   (memory (;0;) 1)
   (global $a (;0;) (mut i32) i32.const 10)
@@ -914,5 +925,6 @@
   (export "add64_u_with_carry" (func $add64_u_with_carry))
   (export "add64_u_saturated" (func $add64_u_saturated))
   (export "type-use" (func 51))
+  (export "atypical-condition" (func 52))
   (elem (;0;) (i32.const 0) func $func)
 )

tests/snapshots/testsuite/proposals/gc/if.wast/0.print

@@ -1,23 +1,6 @@
 (module
-  (type $dummy (;0;) (func))
-  (type (;1;) (func (result funcref)))
-  (func $dummy (;0;) (type $dummy))
-  (func (;1;) (type 1) (result funcref)
-    i32.const 1
-    table.get $t1
-  )
-  (func (;2;) (type 1) (result funcref)
-    i32.const 4
-    table.get $t2
-  )
-  (func (;3;) (type 1) (result funcref)
-    i32.const 7
-    table.get $t3
-  )
-  (table $t1 (;0;) 10 funcref)
-  (table $t2 (;1;) 10 funcref ref.func $dummy)
-  (table $t3 (;2;) 10 (ref 0) ref.func $dummy)
-  (export "get1" (func 1))
-  (export "get2" (func 2))
-  (export "get3" (func 3))
+  (type $f (;0;) (func))
+  (func $f (;0;) (type $f))
+  (global (;0;) (ref 0) ref.func $f)
+  (export "g" (global 0))
 )

tests/snapshots/testsuite/proposals/gc/table.wast/29.print

@@ -0,0 +1,36 @@
+(module
+  (type $dummy (;0;) (func))
+  (type (;1;) (func (result funcref)))
+  (import "M" "g" (global $g (;0;) (ref 0)))
+  (func $dummy (;0;) (type $dummy))
+  (func (;1;) (type 1) (result funcref)
+    i32.const 1
+    table.get $t1
+  )
+  (func (;2;) (type 1) (result funcref)
+    i32.const 4
+    table.get $t2
+  )
+  (func (;3;) (type 1) (result funcref)
+    i32.const 7
+    table.get $t3
+  )
+  (func (;4;) (type 1) (result funcref)
+    i32.const 8
+    table.get $t4
+  )
+  (func (;5;) (type 1) (result funcref)
+    i32.const 9
+    table.get $t5
+  )
+  (table $t1 (;0;) 10 funcref)
+  (table $t2 (;1;) 10 funcref ref.func $dummy)
+  (table $t3 (;2;) 10 (ref 0) ref.func $dummy)
+  (table $t4 (;3;) 10 funcref global.get $g)
+  (table $t5 (;4;) 10 (ref 0) global.get $g)
+  (export "get1" (func 1))
+  (export "get2" (func 2))
+  (export "get3" (func 3))
+  (export "get4" (func 4))
+  (export "get5" (func 5))
+)

tests/snapshots/testsuite/proposals/gc/table.wast/31.print

@@ -3,5 +3,5 @@
     (type $t2 (;0;) (func (param i32 (ref 0))))
   )
   (type (;1;) (func (param (ref 0))))
-  (import "M" "f" (func (;0;) (type 1)))
+  (import "Mr1" "f" (func (;0;) (type 1)))
 )