From 9db0addb6341289f837d43a21febcd847ea348c1 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 19 Dec 2018 15:49:05 -0800 Subject: [PATCH] Update wat syntax with upstream changes --- crates/gc/tests/wat/keep-set-global.wat | 2 +- crates/gc/tests/wat/locals-compressed.wat | 22 +++++++++---------- crates/gc/tests/wat/preserve-local1.wat | 2 +- crates/gc/tests/wat/preserve-local2.wat | 4 ++-- crates/gc/tests/wat/preserve-local3.wat | 4 ++-- crates/gc/tests/wat/remove-import-globals.wat | 6 ++--- crates/gc/tests/wat/renumber-globals.wat | 2 +- crates/gc/tests/wat/renumber-locals.wat | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/crates/gc/tests/wat/keep-set-global.wat b/crates/gc/tests/wat/keep-set-global.wat index 315c6d7f..c23d833b 100644 --- a/crates/gc/tests/wat/keep-set-global.wat +++ b/crates/gc/tests/wat/keep-set-global.wat @@ -17,7 +17,7 @@ ;; (type (;0;) (func)) ;; (func $foo (type 0) ;; i32.const 1 -;; set_global 0) +;; global.set 0) ;; (global (;0;) (mut i32) (i32.const 0)) ;; (start 0)) ;; STDOUT diff --git a/crates/gc/tests/wat/locals-compressed.wat b/crates/gc/tests/wat/locals-compressed.wat index 18fcf924..2ce7d099 100644 --- a/crates/gc/tests/wat/locals-compressed.wat +++ b/crates/gc/tests/wat/locals-compressed.wat @@ -23,17 +23,17 @@ ;; (type (;0;) (func)) ;; (func $foo (type 0) ;; (local i32 i32 i32 i32 f32 f32 f32 f64 f64 i64 i64) -;; get_local 0 -;; get_local 4 -;; get_local 1 -;; get_local 7 -;; get_local 9 -;; get_local 2 -;; get_local 5 -;; get_local 10 -;; get_local 3 -;; get_local 6 -;; get_local 8 +;; local.get 0 +;; local.get 4 +;; local.get 1 +;; local.get 7 +;; local.get 9 +;; local.get 2 +;; local.get 5 +;; local.get 10 +;; local.get 3 +;; local.get 6 +;; local.get 8 ;; unreachable) ;; (export "foo" (func $foo))) ;; STDOUT diff --git a/crates/gc/tests/wat/preserve-local1.wat b/crates/gc/tests/wat/preserve-local1.wat index 782707d1..7ed399ba 100644 --- a/crates/gc/tests/wat/preserve-local1.wat +++ b/crates/gc/tests/wat/preserve-local1.wat @@ -11,6 +11,6 @@ ;; (type (;0;) (func (result i32))) ;; (func $foo (type 0) (result i32) ;; (local i32) -;; get_local 0) +;; local.get 0) ;; (export "foo" (func $foo))) ;; STDOUT diff --git a/crates/gc/tests/wat/preserve-local2.wat b/crates/gc/tests/wat/preserve-local2.wat index 2373ad20..5ef6564f 100644 --- a/crates/gc/tests/wat/preserve-local2.wat +++ b/crates/gc/tests/wat/preserve-local2.wat @@ -12,7 +12,7 @@ ;; (type (;0;) (func (param i32))) ;; (func $foo (type 0) (param i32) ;; (local i32) -;; get_local 0 -;; set_local 1) +;; local.get 0 +;; local.set 1) ;; (export "foo" (func $foo))) ;; STDOUT diff --git a/crates/gc/tests/wat/preserve-local3.wat b/crates/gc/tests/wat/preserve-local3.wat index c46c1982..8738c3b5 100644 --- a/crates/gc/tests/wat/preserve-local3.wat +++ b/crates/gc/tests/wat/preserve-local3.wat @@ -12,7 +12,7 @@ ;; (type (;0;) (func (param i32) (result i32))) ;; (func $foo (type 0) (param i32) (result i32) ;; (local i32) -;; get_local 0 -;; tee_local 1) +;; local.get 0 +;; local.tee 1) ;; (export "foo" (func $foo))) ;; STDOUT diff --git a/crates/gc/tests/wat/remove-import-globals.wat b/crates/gc/tests/wat/remove-import-globals.wat index b34d533b..852642e2 100644 --- a/crates/gc/tests/wat/remove-import-globals.wat +++ b/crates/gc/tests/wat/remove-import-globals.wat @@ -24,11 +24,11 @@ ;; (import "" "a" (global (;0;) i32)) ;; (import "" "c" (global (;1;) i32)) ;; (func $foo (type 0) -;; get_global 0 +;; global.get 0 ;; drop -;; get_global 1 +;; global.get 1 ;; drop -;; get_global 2 +;; global.get 2 ;; drop) ;; (global (;2;) i32 (i32.const 2)) ;; (export "foo" (func $foo))) diff --git a/crates/gc/tests/wat/renumber-globals.wat b/crates/gc/tests/wat/renumber-globals.wat index f34b0832..516e64ad 100644 --- a/crates/gc/tests/wat/renumber-globals.wat +++ b/crates/gc/tests/wat/renumber-globals.wat @@ -10,7 +10,7 @@ ;; (module ;; (type (;0;) (func (result i32))) ;; (func (;0;) (type 0) (result i32) -;; get_global 0) +;; global.get 0) ;; (global (;0;) i32 (i32.const 0)) ;; (export "foo" (func 0))) ;; STDOUT diff --git a/crates/gc/tests/wat/renumber-locals.wat b/crates/gc/tests/wat/renumber-locals.wat index 09f425e3..f6db1ec0 100644 --- a/crates/gc/tests/wat/renumber-locals.wat +++ b/crates/gc/tests/wat/renumber-locals.wat @@ -11,6 +11,6 @@ ;; (type (;0;) (func (result i32))) ;; (func $foo (type 0) (result i32) ;; (local i32) -;; get_local 0) +;; local.get 0) ;; (export "foo" (func $foo))) ;; STDOUT