Repository: bytecodealliance/wasm-tools
Pull request #1298 (2023-11-16 23:10:35)

[wast] Rename extern.internalize and extern.externalize
The following instructions were renamed in wasm-gc (https://github.com/WebAssembly/gc/pull/447):

extern.internalize -> any.convert_extern
extern.externalize -> extern.convert_any

jpages: The tests should be fine (hopefully) once this PR is merged: https://github.com/WebAssembly/testsuite/pull/70
alexcrichton: Thanks! With that merged you should be able to include the submodule update as part of this PR
jpages: I had to update the submodule, and the snapshot files as well... 

Sorry, this PR turns out to bet more complex than expected.

Patch:
diff --git a/crates/wast/src/core/expr.rs b/crates/wast/src/core/expr.rs
index 36561c37..78e2694e 100644
--- a/crates/wast/src/core/expr.rs
+++ b/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",


Test patch:
diff --git a/tests/roundtrip.rs b/tests/roundtrip.rs
index 28408caf..48da681a 100644
--- a/tests/roundtrip.rs
+++ b/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)) {
diff --git a/tests/snapshots/testsuite/comments.wast/4.print b/tests/snapshots/testsuite/comments.wast/4.print
new file mode 100644
index 00000000..ace815b0
--- /dev/null
+++ b/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))
+)
\ No newline at end of file
diff --git a/tests/snapshots/testsuite/if.wast/0.print b/tests/snapshots/testsuite/if.wast/0.print
index 148a4b82..d8f8632d 100644
--- a/tests/snapshots/testsuite/if.wast/0.print
+++ b/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)
 )
\ No newline at end of file
diff --git a/tests/snapshots/testsuite/proposals/exception-handling/rethrow.wast/0.print b/tests/snapshots/testsuite/proposals/exception-handling/rethrow.wast/0.print
deleted file mode 100644
index 389c4a9b..00000000
--- a/tests/snapshots/testsuite/proposals/exception-handling/rethrow.wast/0.print
+++ /dev/null
@@ -1,98 +0,0 @@
-(module
-  (type (;0;) (func))
-  (type (;1;) (func (param i32) (result i32)))
-  (func (;0;) (type 0)
-    try ;; label = @1
-      throw 0
-    catch 0
-      rethrow 0 (;@1;)
-    end
-  )
-  (func (;1;) (type 1) (param i32) (result i32)
-    try (result i32) ;; label = @1
-      throw 0
-    catch 0
-      local.get 0
-      i32.eqz
-      if ;; label = @2
-        rethrow 1 (;@1;)
-      end
-      i32.const 23
-    end
-  )
-  (func (;2;) (type 0)
-    try ;; label = @1
-      throw 0
-    catch_all
-      rethrow 0 (;@1;)
-    end
-  )
-  (func (;3;) (type 1) (param i32) (result i32)
-    try (result i32) ;; label = @1
-      throw 0
-    catch_all
-      local.get 0
-      i32.eqz
-      if ;; label = @2
-        rethrow 1 (;@1;)
-      end
-      i32.const 23
-    end
-  )
-  (func (;4;) (type 1) (param i32) (result i32)
-    try (result i32) ;; label = @1
-      throw 1
-    catch 1
-      try (result i32) ;; label = @2
-        throw 0
-      catch 0
-        local.get 0
-        i32.const 0
-        i32.eq
-        if ;; label = @3
-          rethrow 1 (;@2;)
-        end
-        local.get 0
-        i32.const 1
-        i32.eq
-        if ;; label = @3
-          rethrow 2 (;@1;)
-        end
-        i32.const 23
-      end
-    end
-  )
-  (func (;5;) (type 1) (param i32) (result i32)
-    try (result i32) ;; label = @1
-      throw 0
-    catch 0
-      try (result i32) ;; label = @2
-        local.get 0
-        i32.eqz
-        if ;; label = @3
-          rethrow 2 (;@1;)
-        end
-        i32.const 42
-      catch 0
-        i32.const 23
-      end
-    end
-  )
-  (func (;6;) (type 0)
-    try ;; label = @1
-      throw 0
-    catch 0
-      i32.const 1
-      rethrow 0 (;@1;)
-    end
-  )
-  (tag (;0;) (type 0))
-  (tag (;1;) (type 0))
-  (export "catch-rethrow-0" (func 0))
-  (export "catch-rethrow-1" (func 1))
-  (export "catchall-rethrow-0" (func 2))
-  (export "catchall-rethrow-1" (func 3))
-  (export "rethrow-nested" (func 4))
-  (export "rethrow-recatch" (func 5))
-  (export "rethrow-stack-polymorphism" (func 6))
-)
\ No newline at end of file
diff --git a/tests/snapshots/testsuite/proposals/exception-handling/try_table.wast/0.print b/tests/snapshots/testsuite/proposals/exception-handling/try_table.wast/0.print
new file mode 100644
index 00000000..4ca55c3b
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/exception-handling/try_table.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))
+)
\ No newline at end of file
diff --git a/tests/snapshots/testsuite/proposals/gc/if.wast/0.print b/tests/snapshots/testsuite/proposals/gc/if.wast/0.print
index 148a4b82..d8f8632d 100644
--- a/tests/snapshots/testsuite/proposals/gc/if.wast/0.print
+++ b/tests/snapshots/testsuite/proposals/gc/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)
 )
\ No newline at end of file
diff --git a/tests/snapshots/testsuite/proposals/gc/table.wast/29.print b/tests/snapshots/testsuite/proposals/gc/table.wast/29.print
index 4262eacb..590d93b9 100644
--- a/tests/snapshots/testsuite/proposals/gc/table.wast/29.print
+++ b/tests/snapshots/testsuite/proposals/gc/table.wast/29.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))
 )
\ No newline at end of file
diff --git a/tests/snapshots/testsuite/proposals/gc/table.wast/31.print b/tests/snapshots/testsuite/proposals/gc/table.wast/31.print
new file mode 100644
index 00000000..97e86cfb
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/gc/table.wast/31.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))
+)
\ No newline at end of file
diff --git a/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/22.print b/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/22.print
index dcfa0280..3e1630ac 100644
--- a/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/22.print
+++ b/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/22.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)))
 )
\ No newline at end of file
diff --git a/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/25.print b/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/25.print
index e3251951..d5e025bb 100644
--- a/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/25.print
+++ b/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/25.print
@@ -7,7 +7,7 @@
   (type (;3;) (func (param (ref 0))))
   (type (;4;) (func (param (ref 1))))
   (type (;5;) (func (param (ref 2))))
-  (import "M" "f1" (func (;0;) (type 3)))
-  (import "M" "f2" (func (;1;) (type 4)))
-  (import "M" "f3" (func (;2;) (type 5)))
+  (import "Mr2" "f1" (func (;0;) (type 3)))
+  (import "Mr2" "f2" (func (;1;) (type 4)))
+  (import "Mr2" "f3" (func (;2;) (type 5)))
 )
\ No newline at end of file
diff --git a/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/28.print b/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/28.print
index 27cfb026..624b328e 100644
--- a/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/28.print
+++ b/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/28.print
@@ -7,7 +7,7 @@
   (type (;3;) (func (param (ref 0))))
   (type (;4;) (func (param (ref 1))))
   (type (;5;) (func (param (ref 2))))
-  (import "M" "f1" (func (;0;) (type 3)))
-  (import "M" "f2" (func (;1;) (type 4)))
-  (import "M" "f3" (func (;2;) (type 5)))
+  (import "Mr3" "f1" (func (;0;) (type 3)))
+  (import "Mr3" "f2" (func (;1;) (type 4)))
+  (import "Mr3" "f3" (func (;2;) (type 5)))
 )
\ No newline at end of file
diff --git a/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/31.print b/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/31.print
index f9e87d81..e79f0364 100644
--- a/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/31.print
+++ b/tests/snapshots/testsuite/proposals/gc/type-equivalence.wast/31.print
@@ -12,7 +12,7 @@
   (type (;6;) (func (param (ref 0))))
   (type (;7;) (func (param (ref 2))))
   (type (;8;) (func (param (ref 4))))
-  (import "M" "f1" (func (;0;) (type 6)))
-  (import "M" "f2" (func (;1;) (type 7)))
-  (import "M" "f3" (func (;2;) (type 8)))
+  (import "Mr4" "f1" (func (;0;) (type 6)))
+  (import "Mr4" "f2" (func (;1;) (type 7)))
+  (import "Mr4" "f3" (func (;2;) (type 8)))
 )
\ No newline at end of file
diff --git a/tests/snapshots/testsuite/tokens.wast/8.print b/tests/snapshots/testsuite/token.wast/10.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/8.print
rename to tests/snapshots/testsuite/token.wast/10.print
diff --git a/tests/snapshots/testsuite/tokens.wast/9.print b/tests/snapshots/testsuite/token.wast/11.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/9.print
rename to tests/snapshots/testsuite/token.wast/11.print
diff --git a/tests/snapshots/testsuite/tokens.wast/10.print b/tests/snapshots/testsuite/token.wast/12.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/10.print
rename to tests/snapshots/testsuite/token.wast/12.print
diff --git a/tests/snapshots/testsuite/tokens.wast/0.print b/tests/snapshots/testsuite/token.wast/13.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/0.print
rename to tests/snapshots/testsuite/token.wast/13.print
diff --git a/tests/snapshots/testsuite/tokens.wast/11.print b/tests/snapshots/testsuite/token.wast/14.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/11.print
rename to tests/snapshots/testsuite/token.wast/14.print
diff --git a/tests/snapshots/testsuite/tokens.wast/13.print b/tests/snapshots/testsuite/token.wast/15.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/13.print
rename to tests/snapshots/testsuite/token.wast/15.print
diff --git a/tests/snapshots/testsuite/tokens.wast/14.print b/tests/snapshots/testsuite/token.wast/16.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/14.print
rename to tests/snapshots/testsuite/token.wast/16.print
diff --git a/tests/snapshots/testsuite/tokens.wast/15.print b/tests/snapshots/testsuite/token.wast/17.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/15.print
rename to tests/snapshots/testsuite/token.wast/17.print
diff --git a/tests/snapshots/testsuite/tokens.wast/18.print b/tests/snapshots/testsuite/token.wast/18.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/18.print
rename to tests/snapshots/testsuite/token.wast/18.print
diff --git a/tests/snapshots/testsuite/tokens.wast/12.print b/tests/snapshots/testsuite/token.wast/2.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/12.print
rename to tests/snapshots/testsuite/token.wast/2.print
diff --git a/tests/snapshots/testsuite/tokens.wast/20.print b/tests/snapshots/testsuite/token.wast/20.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/20.print
rename to tests/snapshots/testsuite/token.wast/20.print
diff --git a/tests/snapshots/testsuite/tokens.wast/16.print b/tests/snapshots/testsuite/token.wast/22.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/16.print
rename to tests/snapshots/testsuite/token.wast/22.print
diff --git a/tests/snapshots/testsuite/tokens.wast/22.print b/tests/snapshots/testsuite/token.wast/24.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/22.print
rename to tests/snapshots/testsuite/token.wast/24.print
diff --git a/tests/snapshots/testsuite/tokens.wast/23.print b/tests/snapshots/testsuite/token.wast/25.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/23.print
rename to tests/snapshots/testsuite/token.wast/25.print
diff --git a/tests/snapshots/testsuite/tokens.wast/24.print b/tests/snapshots/testsuite/token.wast/26.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/24.print
rename to tests/snapshots/testsuite/token.wast/26.print
diff --git a/tests/snapshots/testsuite/tokens.wast/26.print b/tests/snapshots/testsuite/token.wast/28.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/26.print
rename to tests/snapshots/testsuite/token.wast/28.print
diff --git a/tests/snapshots/testsuite/tokens.wast/3.print b/tests/snapshots/testsuite/token.wast/3.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/3.print
rename to tests/snapshots/testsuite/token.wast/3.print
diff --git a/tests/snapshots/testsuite/tokens.wast/28.print b/tests/snapshots/testsuite/token.wast/30.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/28.print
rename to tests/snapshots/testsuite/token.wast/30.print
diff --git a/tests/snapshots/testsuite/tokens.wast/30.print b/tests/snapshots/testsuite/token.wast/32.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/30.print
rename to tests/snapshots/testsuite/token.wast/32.print
diff --git a/tests/snapshots/testsuite/tokens.wast/32.print b/tests/snapshots/testsuite/token.wast/34.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/32.print
rename to tests/snapshots/testsuite/token.wast/34.print
diff --git a/tests/snapshots/testsuite/tokens.wast/34.print b/tests/snapshots/testsuite/token.wast/36.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/34.print
rename to tests/snapshots/testsuite/token.wast/36.print
diff --git a/tests/snapshots/testsuite/tokens.wast/36.print b/tests/snapshots/testsuite/token.wast/38.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/36.print
rename to tests/snapshots/testsuite/token.wast/38.print
diff --git a/tests/snapshots/testsuite/tokens.wast/1.print b/tests/snapshots/testsuite/token.wast/4.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/1.print
rename to tests/snapshots/testsuite/token.wast/4.print
diff --git a/tests/snapshots/testsuite/tokens.wast/38.print b/tests/snapshots/testsuite/token.wast/40.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/38.print
rename to tests/snapshots/testsuite/token.wast/40.print
diff --git a/tests/snapshots/testsuite/tokens.wast/40.print b/tests/snapshots/testsuite/token.wast/42.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/40.print
rename to tests/snapshots/testsuite/token.wast/42.print
diff --git a/tests/snapshots/testsuite/tokens.wast/44.print b/tests/snapshots/testsuite/token.wast/44.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/44.print
rename to tests/snapshots/testsuite/token.wast/44.print
diff --git a/tests/snapshots/testsuite/tokens.wast/42.print b/tests/snapshots/testsuite/token.wast/46.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/42.print
rename to tests/snapshots/testsuite/token.wast/46.print
diff --git a/tests/snapshots/testsuite/tokens.wast/46.print b/tests/snapshots/testsuite/token.wast/48.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/46.print
rename to tests/snapshots/testsuite/token.wast/48.print
diff --git a/tests/snapshots/testsuite/tokens.wast/2.print b/tests/snapshots/testsuite/token.wast/5.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/2.print
rename to tests/snapshots/testsuite/token.wast/5.print
diff --git a/tests/snapshots/testsuite/tokens.wast/50.print b/tests/snapshots/testsuite/token.wast/50.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/50.print
rename to tests/snapshots/testsuite/token.wast/50.print
diff --git a/tests/snapshots/testsuite/tokens.wast/48.print b/tests/snapshots/testsuite/token.wast/52.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/48.print
rename to tests/snapshots/testsuite/token.wast/52.print
diff --git a/tests/snapshots/testsuite/tokens.wast/4.print b/tests/snapshots/testsuite/token.wast/6.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/4.print
rename to tests/snapshots/testsuite/token.wast/6.print
diff --git a/tests/snapshots/testsuite/tokens.wast/5.print b/tests/snapshots/testsuite/token.wast/7.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/5.print
rename to tests/snapshots/testsuite/token.wast/7.print
diff --git a/tests/snapshots/testsuite/tokens.wast/6.print b/tests/snapshots/testsuite/token.wast/8.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/6.print
rename to tests/snapshots/testsuite/token.wast/8.print
diff --git a/tests/snapshots/testsuite/tokens.wast/7.print b/tests/snapshots/testsuite/token.wast/9.print
similarity index 100%
rename from tests/snapshots/testsuite/tokens.wast/7.print
rename to tests/snapshots/testsuite/token.wast/9.print
diff --git a/tests/testsuite b/tests/testsuite
index c2a67a57..26d62d0a 160000
--- a/tests/testsuite
+++ b/tests/testsuite
@@ -1,1 +1,1 @@
-Subproject commit c2a67a575ddc815ff2212f68301d333e5e30a923
+Subproject commit 26d62d0ad297b14218807cd20d9b568e11ec7bd9