validate in binaryen shell and on wasm binaries, and fix type checking

6 files changed, 10 insertions, 8 deletions

diff --git a/test/dot_s/exit.s b/test/dot_s/exit.s
index 2fad9277f..bf24ead9e 100644
--- a/test/dot_s/exit.s
+++ b/test/dot_s/exit.s
@@ -7,5 +7,6 @@ main:
 	.local i32
 	i32.const $push0=, 0
 	call exit@FUNCTION, $pop0
+	unreachable
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
diff --git a/test/dot_s/exit.wast b/test/dot_s/exit.wast
index 263fbf647..77fb13b0b 100644
--- a/test/dot_s/exit.wast
+++ b/test/dot_s/exit.wast
@@ -9,6 +9,7 @@
     (call_import $exit
       (i32.const 0)
     )
+    (unreachable)
   )
 )
 ;; METADATA: { "asmConsts": {},"staticBump": 12, "initializers": [] }
diff --git a/test/llvm_autogenerated/i64-load-store-alignment.s b/test/llvm_autogenerated/i64-load-store-alignment.s
index a61aa2965..2f290e044 100644
--- a/test/llvm_autogenerated/i64-load-store-alignment.s
+++ b/test/llvm_autogenerated/i64-load-store-alignment.s
@@ -60,7 +60,7 @@ ldi64:
 ldi64_a16:
 	.param  	i32
 	.result 	i64
-	i64.load	$push0=, 0($0):p2align=4
+	i64.load	$push0=, 0($0):p2align=3
 	return  	$pop0
 	.endfunc
 .Lfunc_end5:
@@ -219,7 +219,7 @@ sti64:
 	.type	sti64_a16,@function
 sti64_a16:
 	.param  	i32, i64
-	i64.store	$discard=, 0($0):p2align=4, $1
+	i64.store	$discard=, 0($0):p2align=3, $1
 	return
 	.endfunc
 .Lfunc_end20:
diff --git a/test/llvm_autogenerated/i64-load-store-alignment.wast b/test/llvm_autogenerated/i64-load-store-alignment.wast
index 9741e5a72..d6c76de7a 100644
--- a/test/llvm_autogenerated/i64-load-store-alignment.wast
+++ b/test/llvm_autogenerated/i64-load-store-alignment.wast
@@ -70,7 +70,7 @@
   )
   (func $ldi64_a16 (param $$0 i32) (result i64)
     (return
-      (i64.load align=16
+      (i64.load
         (get_local $$0)
       )
     )
@@ -174,7 +174,7 @@
     (return)
   )
   (func $sti64_a16 (param $$0 i32) (param $$1 i64)
-    (i64.store align=16
+    (i64.store
       (get_local $$0)
       (get_local $$1)
     )
diff --git a/test/passes/remove-unused-brs.txt b/test/passes/remove-unused-brs.txt
index a7bd70ecc..a8e7f29be 100644
--- a/test/passes/remove-unused-brs.txt
+++ b/test/passes/remove-unused-brs.txt
@@ -88,7 +88,7 @@
       )
     )
   )
-  (func $b12-yes (result i32)
+  (func $b12-yes
     (block $topmost
       (select
         (block $block1
@@ -144,7 +144,7 @@
       )
     )
   )
-  (func $b15 (result i32)
+  (func $b15
     (block $topmost
       (br_if $topmost
         (i32.const 0)
diff --git a/test/passes/remove-unused-brs.wast b/test/passes/remove-unused-brs.wast
index dc67ad4da..8b9d42bc1 100644
--- a/test/passes/remove-unused-brs.wast
+++ b/test/passes/remove-unused-brs.wast
@@ -91,7 +91,7 @@
       )
     )
   )
-  (func $b12-yes (result i32)
+  (func $b12-yes
     (block $topmost
       (if_else (i32.const 1)
         (block
@@ -149,7 +149,7 @@
       )
     )
   )
-  (func $b15 (result i32)
+  (func $b15
     (block $topmost
       (if
         (i32.const 18)