Rewrite wasm-shell to use new wast parser (#6601)

Use the new wast parser to parse a full script up front, then traverse the
parsed script data structure and execute the commands. wasm-shell had previously
used the new wat parser for top-level modules, but it now uses the new parser
for module assertions as well. Fix various bugs this uncovered.

After this change, wasm-shell supports all the assertions used in the upstream
spec tests (although not new kinds of assertions introduced in any proposals).
Uncomment various `assert_exhaustion` tests that we can now execute.

Other kinds of assertions remain commented out in our tests: wasm-shell now
supports `assert_unlinkable`, but the interpreter does not eagerly check for the
existence of imports, so those tests do not pass. Tests that check for NaNs also
remain commented out because they do not yet use the standard syntax that
wasm-shell now supports for canonical and arithmetic NaN results, and our
interpreter would not pass all of those tests even if they did use the standard
syntax.

7 files changed, 33 insertions, 46 deletions

diff --git a/test/spec/address64.wast b/test/spec/address64.wast
index b3b009ae0..29771ae77 100644
--- a/test/spec/address64.wast
+++ b/test/spec/address64.wast
@@ -203,13 +203,6 @@
 (assert_trap (invoke "16s_bad" (i64.const 1)) "out of bounds memory access")
 (assert_trap (invoke "32_bad" (i64.const 1)) "out of bounds memory access")
 
-(assert_malformed
-  (module quote
-    "(memory i64 1)"
-    "(func (drop (i32.load offset=4294967296 (i64.const 0))))"
-  )
-  "i32 constant"
-)
 
 ;; Load i64 data with different offset/align arguments
 
diff --git a/test/spec/call.wast b/test/spec/call.wast
index 89082fbed..4d0f1a7c2 100644
--- a/test/spec/call.wast
+++ b/test/spec/call.wast
@@ -279,8 +279,8 @@
 (assert_return (invoke "odd" (i64.const 200)) (i32.const 99))
 (assert_return (invoke "odd" (i64.const 77)) (i32.const 44))
 
-;; (assert_exhaustion (invoke "runaway") "call stack exhausted")
-;; (assert_exhaustion (invoke "mutual-runaway") "call stack exhausted")
+(assert_exhaustion (invoke "runaway") "call stack exhausted")
+(assert_exhaustion (invoke "mutual-runaway") "call stack exhausted")
 
 (assert_return (invoke "as-select-first") (i32.const 0x132))
 (assert_return (invoke "as-select-mid") (i32.const 2))
diff --git a/test/spec/call_indirect.wast b/test/spec/call_indirect.wast
index 791a756ca..87d1df75a 100644
--- a/test/spec/call_indirect.wast
+++ b/test/spec/call_indirect.wast
@@ -553,8 +553,8 @@
 (assert_return (invoke "odd" (i32.const 200)) (i32.const 99))
 (assert_return (invoke "odd" (i32.const 77)) (i32.const 44))
 
-;; (assert_exhaustion (invoke "runaway") "call stack exhausted")
-;; (assert_exhaustion (invoke "mutual-runaway") "call stack exhausted")
+(assert_exhaustion (invoke "runaway") "call stack exhausted")
+(assert_exhaustion (invoke "mutual-runaway") "call stack exhausted")
 
 (assert_return (invoke "as-select-first") (i32.const 0x132))
 (assert_return (invoke "as-select-mid") (i32.const 2))
diff --git a/test/spec/exception-handling-old.wast b/test/spec/exception-handling-old.wast
index 5024fa734..6b4631877 100644
--- a/test/spec/exception-handling-old.wast
+++ b/test/spec/exception-handling-old.wast
@@ -352,40 +352,34 @@
   "tag's param numbers must match"
 )
 
-(assert_invalid
-  (module
-    (func $f0
-      (block $l0
-        (try
-          (do
-            (try
-              (do)
-              (delegate $l0) ;; target is a block
-            )
+(module
+  (func $f0
+    (block $l0
+      (try
+        (do
+          (try
+            (do)
+            (delegate $l0) ;; target is a block
           )
-          (catch_all)
         )
+        (catch_all)
       )
     )
   )
-  "all delegate targets must be valid"
 )
 
-(assert_invalid
-  (module
-    (func $f0
-      (try $l0
-        (do)
-        (catch_all
-          (try
-            (do)
-            (delegate $l0) ;; the target catch is above the delegate
-          )
+(module
+  (func $f0
+    (try $l0
+      (do)
+      (catch_all
+        (try
+          (do)
+          (delegate $l0) ;; the target catch is above the delegate
         )
       )
     )
   )
-  "all delegate targets must be valid"
 )
 
 (assert_invalid
diff --git a/test/spec/fac.wast b/test/spec/fac.wast
index 521cdc459..ef10991a8 100644
--- a/test/spec/fac.wast
+++ b/test/spec/fac.wast
@@ -86,4 +86,4 @@
 (assert_return (invoke "fac-rec-named" (i64.const 25)) (i64.const 7034535277573963776))
 (assert_return (invoke "fac-iter-named" (i64.const 25)) (i64.const 7034535277573963776))
 (assert_return (invoke "fac-opt" (i64.const 25)) (i64.const 7034535277573963776))
-;; (assert_exhaustion (invoke "fac-rec" (i64.const 1073741824)) "call stack exhausted")
+(assert_exhaustion (invoke "fac-rec" (i64.const 1073741824)) "call stack exhausted")
diff --git a/test/spec/inline-module.wast b/test/spec/inline-module.wast
index a8871dfb2..dc7ead776 100644
--- a/test/spec/inline-module.wast
+++ b/test/spec/inline-module.wast
@@ -1 +1 @@
-;; (func) (memory 0) (func (export "f"))
+(func) (memory 0) (func (export "f"))
diff --git a/test/spec/skip-stack-guard-page.wast b/test/spec/skip-stack-guard-page.wast
index 4f9273eb6..a472e6814 100644
--- a/test/spec/skip-stack-guard-page.wast
+++ b/test/spec/skip-stack-guard-page.wast
@@ -2272,13 +2272,13 @@
   )
 )
 
-;; (assert_exhaustion (invoke "test-guard-page-skip" (i32.const 0)) "call stack exhausted")
-;; (assert_exhaustion (invoke "test-guard-page-skip" (i32.const 100)) "call stack exhausted")
-;; (assert_exhaustion (invoke "test-guard-page-skip" (i32.const 200)) "call stack exhausted")
-;; (assert_exhaustion (invoke "test-guard-page-skip" (i32.const 300)) "call stack exhausted")
-;; (assert_exhaustion (invoke "test-guard-page-skip" (i32.const 400)) "call stack exhausted")
-;; (assert_exhaustion (invoke "test-guard-page-skip" (i32.const 500)) "call stack exhausted")
-;; (assert_exhaustion (invoke "test-guard-page-skip" (i32.const 600)) "call stack exhausted")
-;; (assert_exhaustion (invoke "test-guard-page-skip" (i32.const 700)) "call stack exhausted")
-;; (assert_exhaustion (invoke "test-guard-page-skip" (i32.const 800)) "call stack exhausted")
-;; (assert_exhaustion (invoke "test-guard-page-skip" (i32.const 900)) "call stack exhausted")
+(assert_exhaustion (invoke "test-guard-page-skip" (i32.const 0)) "call stack exhausted")
+(assert_exhaustion (invoke "test-guard-page-skip" (i32.const 100)) "call stack exhausted")
+(assert_exhaustion (invoke "test-guard-page-skip" (i32.const 200)) "call stack exhausted")
+(assert_exhaustion (invoke "test-guard-page-skip" (i32.const 300)) "call stack exhausted")
+(assert_exhaustion (invoke "test-guard-page-skip" (i32.const 400)) "call stack exhausted")
+(assert_exhaustion (invoke "test-guard-page-skip" (i32.const 500)) "call stack exhausted")
+(assert_exhaustion (invoke "test-guard-page-skip" (i32.const 600)) "call stack exhausted")
+(assert_exhaustion (invoke "test-guard-page-skip" (i32.const 700)) "call stack exhausted")
+(assert_exhaustion (invoke "test-guard-page-skip" (i32.const 800)) "call stack exhausted")
+(assert_exhaustion (invoke "test-guard-page-skip" (i32.const 900)) "call stack exhausted")