diff options
Diffstat (limited to 'test')
134 files changed, 48 insertions, 517 deletions
diff --git a/test/binaryen.js/debug-info.js.txt b/test/binaryen.js/debug-info.js.txt index 7802e3415..027961741 100644 --- a/test/binaryen.js/debug-info.js.txt +++ b/test/binaryen.js/debug-info.js.txt @@ -5,7 +5,6 @@ debugInfo=false (memory $0 0) (export "test" (func $0)) (func $0 - (nop) ) ) @@ -16,7 +15,6 @@ debugInfo=true (memory $0 0) (export "test" (func $test)) (func $test - (nop) ) ) @@ -27,7 +25,6 @@ debugInfo=false (memory $0 0) (export "test" (func $0)) (func $0 - (nop) ) ) diff --git a/test/binaryen.js/debug-names.js.txt b/test/binaryen.js/debug-names.js.txt index dc66048ca..34de198cd 100644 --- a/test/binaryen.js/debug-names.js.txt +++ b/test/binaryen.js/debug-names.js.txt @@ -16,7 +16,6 @@ (table $wor 0 0 funcref) (func $of (param $wasm i32) (local $!#$%&'*+-./:<=>?@\^_`|~ f64) - (nop) ) ) @@ -28,7 +27,6 @@ (table $wor 0 0 funcref) (func $of (param $js i32) (local $!#$%&'*+-./:<=>?@\5c^_`|~ f64) - (nop) ) ) @@ -40,7 +38,6 @@ (table $wor 0 0 funcref) (func $of (param $js i32) (local $!#$%&'*+-./:<=>?@\5c^_`|~ f64) - (nop) ) ) diff --git a/test/example/module-splitting.txt b/test/example/module-splitting.txt index fe878d739..709ebd4d7 100644 --- a/test/example/module-splitting.txt +++ b/test/example/module-splitting.txt @@ -585,7 +585,6 @@ Before: (elem $0 (global.get $base) $null $foo) (export "foo" (func $foo)) (func $null (type $0) - (nop) ) (func $foo (type $1) (param $0 i32) (result i32) (local.get $0) @@ -607,7 +606,6 @@ After: (export "%table_2" (table $0)) (export "%global" (global $base)) (func $null (type $0) - (nop) ) (func $foo (type $1) (param $0 i32) (result i32) (call_indirect $0 (type $1) @@ -1144,7 +1142,6 @@ Before: (export "foo1" (func $foo)) (export "foo2" (func $foo)) (func $foo (type $0) - (nop) ) ) Keeping: <none> @@ -1169,7 +1166,6 @@ Secondary: (import "primary" "%table" (table $0 1 funcref)) (elem $0 (i32.const 0) $foo) (func $foo (type $0) - (nop) ) ) diff --git a/test/gtest/cfg.cpp b/test/gtest/cfg.cpp index b8d26caa4..35ccf855b 100644 --- a/test/gtest/cfg.cpp +++ b/test/gtest/cfg.cpp @@ -149,7 +149,7 @@ TEST_F(CFGTest, Empty) { ;; entry ;; exit 0: - 0: nop + 0: block )cfg"; Module wasm; diff --git a/test/lit/basic/complexTextNames.wast b/test/lit/basic/complexTextNames.wast index 88240e038..16c19aadf 100644 --- a/test/lit/basic/complexTextNames.wast +++ b/test/lit/basic/complexTextNames.wast @@ -13,12 +13,10 @@ ;; CHECK-TEXT: (type $0 (func)) ;; CHECK-TEXT: (func $foo\20\28.bar\29 (type $0) - ;; CHECK-TEXT-NEXT: (nop) ;; CHECK-TEXT-NEXT: ) ;; CHECK-BIN: (type $0 (func)) ;; CHECK-BIN: (func $foo\20\28.bar\29 (type $0) - ;; CHECK-BIN-NEXT: (nop) ;; CHECK-BIN-NEXT: ) (func $foo\20\28.bar\29) @@ -34,7 +32,6 @@ ;; CHECK-BIN-NODEBUG: (type $0 (func)) ;; CHECK-BIN-NODEBUG: (func $0 (type $0) -;; CHECK-BIN-NODEBUG-NEXT: (nop) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG: (func $1 (type $0) diff --git a/test/lit/basic/duplicate_types.wast b/test/lit/basic/duplicate_types.wast index 244d97bc9..1c1462b37 100644 --- a/test/lit/basic/duplicate_types.wast +++ b/test/lit/basic/duplicate_types.wast @@ -25,12 +25,10 @@ ;; CHECK-TEXT: (type $1 (func (param i32) (result i32))) ;; CHECK-TEXT: (func $f0 (type $0) (param $0 i32) - ;; CHECK-TEXT-NEXT: (nop) ;; CHECK-TEXT-NEXT: ) ;; CHECK-BIN: (type $1 (func (param i32) (result i32))) ;; CHECK-BIN: (func $f0 (type $0) (param $0 i32) - ;; CHECK-BIN-NEXT: (nop) ;; CHECK-BIN-NEXT: ) (func $f0 (param i32)) @@ -47,7 +45,6 @@ ;; CHECK-BIN-NODEBUG: (type $1 (func (param i32) (result i32))) ;; CHECK-BIN-NODEBUG: (func $0 (type $0) (param $0 i32) -;; CHECK-BIN-NODEBUG-NEXT: (nop) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG: (func $1 (type $1) (param $0 i32) (result i32) diff --git a/test/lit/basic/exception-handling-legacy.wast b/test/lit/basic/exception-handling-legacy.wast index 6d6c82e83..70cc3f5bc 100644 --- a/test/lit/basic/exception-handling-legacy.wast +++ b/test/lit/basic/exception-handling-legacy.wast @@ -47,18 +47,14 @@ (tag $e-empty) ;; CHECK-TEXT: (func $foo (type $0) - ;; CHECK-TEXT-NEXT: (nop) ;; CHECK-TEXT-NEXT: ) ;; CHECK-BIN: (func $foo (type $0) - ;; CHECK-BIN-NEXT: (nop) ;; CHECK-BIN-NEXT: ) (func $foo) ;; CHECK-TEXT: (func $bar (type $0) - ;; CHECK-TEXT-NEXT: (nop) ;; CHECK-TEXT-NEXT: ) ;; CHECK-BIN: (func $bar (type $0) - ;; CHECK-BIN-NEXT: (nop) ;; CHECK-BIN-NEXT: ) (func $bar) @@ -223,7 +219,6 @@ ;; CHECK-TEXT: (func $empty-try-body (type $0) ;; CHECK-TEXT-NEXT: (try ;; CHECK-TEXT-NEXT: (do - ;; CHECK-TEXT-NEXT: (nop) ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: (catch $e-i32 ;; CHECK-TEXT-NEXT: (drop @@ -235,7 +230,6 @@ ;; CHECK-BIN: (func $empty-try-body (type $0) ;; CHECK-BIN-NEXT: (try $label$3 ;; CHECK-BIN-NEXT: (do - ;; CHECK-BIN-NEXT: (nop) ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: (catch $e-i32 ;; CHECK-BIN-NEXT: (drop @@ -357,7 +351,6 @@ ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: (catch_all - ;; CHECK-TEXT-NEXT: (nop) ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: ) @@ -369,7 +362,6 @@ ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: (catch_all - ;; CHECK-BIN-NEXT: (nop) ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: ) @@ -461,7 +453,6 @@ ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: (catch_all - ;; CHECK-TEXT-NEXT: (nop) ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: ) @@ -483,7 +474,6 @@ ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: (catch_all - ;; CHECK-TEXT-NEXT: (nop) ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: ) @@ -504,7 +494,6 @@ ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: (catch_all - ;; CHECK-BIN-NEXT: (nop) ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: ) @@ -526,7 +515,6 @@ ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: (catch_all - ;; CHECK-BIN-NEXT: (nop) ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: ) @@ -605,7 +593,6 @@ ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: (catch_all - ;; CHECK-TEXT-NEXT: (nop) ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: ) @@ -628,7 +615,6 @@ ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: (catch_all - ;; CHECK-BIN-NEXT: (nop) ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: ) @@ -674,7 +660,6 @@ ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: (catch_all - ;; CHECK-TEXT-NEXT: (nop) ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: ) @@ -703,7 +688,6 @@ ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: (catch_all - ;; CHECK-BIN-NEXT: (nop) ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: ) @@ -780,20 +764,16 @@ ;; CHECK-TEXT: (func $empty-catch-body (type $0) ;; CHECK-TEXT-NEXT: (try ;; CHECK-TEXT-NEXT: (do - ;; CHECK-TEXT-NEXT: (nop) ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: (catch $e-empty - ;; CHECK-TEXT-NEXT: (nop) ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: ) ;; CHECK-BIN: (func $empty-catch-body (type $0) ;; CHECK-BIN-NEXT: (try $label$3 ;; CHECK-BIN-NEXT: (do - ;; CHECK-BIN-NEXT: (nop) ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: (catch $e-empty - ;; CHECK-BIN-NEXT: (nop) ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: ) @@ -1068,7 +1048,6 @@ ;; CHECK-TEXT-NEXT: (rethrow $l0) ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: (catch_all - ;; CHECK-TEXT-NEXT: (nop) ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: ) @@ -1083,7 +1062,6 @@ ;; CHECK-TEXT-NEXT: (rethrow $l00) ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: (catch_all - ;; CHECK-TEXT-NEXT: (nop) ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: ) @@ -1100,7 +1078,6 @@ ;; CHECK-BIN-NEXT: (rethrow $label$6) ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: (catch_all - ;; CHECK-BIN-NEXT: (nop) ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: ) @@ -1115,7 +1092,6 @@ ;; CHECK-BIN-NEXT: (rethrow $label$12) ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: (catch_all - ;; CHECK-BIN-NEXT: (nop) ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: ) @@ -1154,7 +1130,6 @@ ;; CHECK-TEXT: (func $pop-within-if-condition (type $0) ;; CHECK-TEXT-NEXT: (try ;; CHECK-TEXT-NEXT: (do - ;; CHECK-TEXT-NEXT: (nop) ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: (catch $e-i32 ;; CHECK-TEXT-NEXT: (throw $e-i32 @@ -1174,7 +1149,6 @@ ;; CHECK-BIN: (func $pop-within-if-condition (type $0) ;; CHECK-BIN-NEXT: (try $label$5 ;; CHECK-BIN-NEXT: (do - ;; CHECK-BIN-NEXT: (nop) ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: (catch $e-i32 ;; CHECK-BIN-NEXT: (throw $e-i32 @@ -1214,7 +1188,6 @@ ;; CHECK-TEXT: (func $pop-can-be-supertype (type $0) ;; CHECK-TEXT-NEXT: (try ;; CHECK-TEXT-NEXT: (do - ;; CHECK-TEXT-NEXT: (nop) ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: (catch $e-eqref ;; CHECK-TEXT-NEXT: (drop @@ -1226,7 +1199,6 @@ ;; CHECK-BIN: (func $pop-can-be-supertype (type $0) ;; CHECK-BIN-NEXT: (try $label$3 ;; CHECK-BIN-NEXT: (do - ;; CHECK-BIN-NEXT: (nop) ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: (catch $e-eqref ;; CHECK-BIN-NEXT: (drop @@ -1297,7 +1269,6 @@ ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: (try ;; CHECK-TEXT-NEXT: (do - ;; CHECK-TEXT-NEXT: (nop) ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: (delegate 1) ;; CHECK-TEXT-NEXT: ) @@ -1310,7 +1281,6 @@ ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: (try $label$5 ;; CHECK-BIN-NEXT: (do - ;; CHECK-BIN-NEXT: (nop) ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: (delegate 1) ;; CHECK-BIN-NEXT: ) @@ -1351,11 +1321,9 @@ ;; CHECK-BIN-NODEBUG: (tag $tag$4) ;; CHECK-BIN-NODEBUG: (func $0 (type $0) -;; CHECK-BIN-NODEBUG-NEXT: (nop) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG: (func $1 (type $0) -;; CHECK-BIN-NODEBUG-NEXT: (nop) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG: (func $2 (type $0) @@ -1430,7 +1398,6 @@ ;; CHECK-BIN-NODEBUG: (func $5 (type $0) ;; CHECK-BIN-NODEBUG-NEXT: (try $label$3 ;; CHECK-BIN-NODEBUG-NEXT: (do -;; CHECK-BIN-NODEBUG-NEXT: (nop) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: (catch $tag$0 ;; CHECK-BIN-NODEBUG-NEXT: (drop @@ -1484,7 +1451,6 @@ ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: (catch_all -;; CHECK-BIN-NODEBUG-NEXT: (nop) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: ) @@ -1528,7 +1494,6 @@ ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: (catch_all -;; CHECK-BIN-NODEBUG-NEXT: (nop) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: ) @@ -1550,7 +1515,6 @@ ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: (catch_all -;; CHECK-BIN-NODEBUG-NEXT: (nop) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: ) @@ -1586,7 +1550,6 @@ ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: (catch_all -;; CHECK-BIN-NODEBUG-NEXT: (nop) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: ) @@ -1615,7 +1578,6 @@ ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: (catch_all -;; CHECK-BIN-NODEBUG-NEXT: (nop) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: ) @@ -1640,10 +1602,8 @@ ;; CHECK-BIN-NODEBUG: (func $15 (type $0) ;; CHECK-BIN-NODEBUG-NEXT: (try $label$3 ;; CHECK-BIN-NODEBUG-NEXT: (do -;; CHECK-BIN-NODEBUG-NEXT: (nop) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: (catch $tag$4 -;; CHECK-BIN-NODEBUG-NEXT: (nop) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: ) @@ -1745,7 +1705,6 @@ ;; CHECK-BIN-NODEBUG-NEXT: (rethrow $label$6) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: (catch_all -;; CHECK-BIN-NODEBUG-NEXT: (nop) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: ) @@ -1760,7 +1719,6 @@ ;; CHECK-BIN-NODEBUG-NEXT: (rethrow $label$12) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: (catch_all -;; CHECK-BIN-NODEBUG-NEXT: (nop) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: ) @@ -1770,7 +1728,6 @@ ;; CHECK-BIN-NODEBUG: (func $21 (type $0) ;; CHECK-BIN-NODEBUG-NEXT: (try $label$5 ;; CHECK-BIN-NODEBUG-NEXT: (do -;; CHECK-BIN-NODEBUG-NEXT: (nop) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: (catch $tag$0 ;; CHECK-BIN-NODEBUG-NEXT: (throw $tag$0 @@ -1791,7 +1748,6 @@ ;; CHECK-BIN-NODEBUG: (func $22 (type $0) ;; CHECK-BIN-NODEBUG-NEXT: (try $label$3 ;; CHECK-BIN-NODEBUG-NEXT: (do -;; CHECK-BIN-NODEBUG-NEXT: (nop) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: (catch $tag$3 ;; CHECK-BIN-NODEBUG-NEXT: (drop @@ -1824,7 +1780,6 @@ ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: (try $label$5 ;; CHECK-BIN-NODEBUG-NEXT: (do -;; CHECK-BIN-NODEBUG-NEXT: (nop) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: (delegate 1) ;; CHECK-BIN-NODEBUG-NEXT: ) diff --git a/test/lit/basic/exception-handling.wast b/test/lit/basic/exception-handling.wast index 05e7c0e31..97be09c04 100644 --- a/test/lit/basic/exception-handling.wast +++ b/test/lit/basic/exception-handling.wast @@ -67,10 +67,8 @@ (tag $e-empty) ;; CHECK-TEXT: (func $foo (type $0) - ;; CHECK-TEXT-NEXT: (nop) ;; CHECK-TEXT-NEXT: ) ;; CHECK-BIN: (func $foo (type $0) - ;; CHECK-BIN-NEXT: (nop) ;; CHECK-BIN-NEXT: ) (func $foo) @@ -138,7 +136,6 @@ ;; CHECK-TEXT: (func $catchless-try-table (type $0) ;; CHECK-TEXT-NEXT: (try_table - ;; CHECK-TEXT-NEXT: (nop) ;; CHECK-TEXT-NEXT: ) ;; CHECK-TEXT-NEXT: (try_table ;; CHECK-TEXT-NEXT: (throw $e-empty) @@ -146,7 +143,6 @@ ;; CHECK-TEXT-NEXT: ) ;; CHECK-BIN: (func $catchless-try-table (type $0) ;; CHECK-BIN-NEXT: (try_table - ;; CHECK-BIN-NEXT: (nop) ;; CHECK-BIN-NEXT: ) ;; CHECK-BIN-NEXT: (try_table ;; CHECK-BIN-NEXT: (throw $e-empty) @@ -753,7 +749,6 @@ ;; CHECK-BIN-NODEBUG: (tag $tag$4) ;; CHECK-BIN-NODEBUG: (func $0 (type $0) -;; CHECK-BIN-NODEBUG-NEXT: (nop) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG: (func $1 (type $3) (result exnref) @@ -780,7 +775,6 @@ ;; CHECK-BIN-NODEBUG: (func $2 (type $0) ;; CHECK-BIN-NODEBUG-NEXT: (try_table -;; CHECK-BIN-NODEBUG-NEXT: (nop) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG-NEXT: (try_table ;; CHECK-BIN-NODEBUG-NEXT: (throw $tag$4) diff --git a/test/lit/basic/multi-table.wast b/test/lit/basic/multi-table.wast index 71dd275aa..2d6b436a6 100644 --- a/test/lit/basic/multi-table.wast +++ b/test/lit/basic/multi-table.wast @@ -97,18 +97,14 @@ (func $f (drop (ref.func $h))) ;; CHECK-TEXT: (func $g (type $none_=>_none) - ;; CHECK-TEXT-NEXT: (nop) ;; CHECK-TEXT-NEXT: ) ;; CHECK-BIN: (func $g (type $none_=>_none) - ;; CHECK-BIN-NEXT: (nop) ;; CHECK-BIN-NEXT: ) (func $g) ;; CHECK-TEXT: (func $h (type $none_=>_none) - ;; CHECK-TEXT-NEXT: (nop) ;; CHECK-TEXT-NEXT: ) ;; CHECK-BIN: (func $h (type $none_=>_none) - ;; CHECK-BIN-NEXT: (nop) ;; CHECK-BIN-NEXT: ) (func $h) ) @@ -155,9 +151,7 @@ ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG: (func $1 (type $0) -;; CHECK-BIN-NODEBUG-NEXT: (nop) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG: (func $2 (type $0) -;; CHECK-BIN-NODEBUG-NEXT: (nop) ;; CHECK-BIN-NODEBUG-NEXT: ) diff --git a/test/lit/basic/pop-fixup.wast b/test/lit/basic/pop-fixup.wast index 371365a0c..9ef51dad8 100644 --- a/test/lit/basic/pop-fixup.wast +++ b/test/lit/basic/pop-fixup.wast @@ -12,7 +12,6 @@ ;; CHECK-NEXT: (local $1 i32) ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $e ;; CHECK-NEXT: (local.set $1 @@ -43,7 +42,6 @@ ;; CHECK-NEXT: (local $1 i32) ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $e ;; CHECK-NEXT: (local.set $1 @@ -78,7 +76,6 @@ ;; CHECK-NEXT: (local $2 (tuple i32 i32)) ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $e2 ;; CHECK-NEXT: (local.set $2 @@ -118,7 +115,6 @@ ;; CHECK-NEXT: (local $2 (tuple i32 i32)) ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $e2 ;; CHECK-NEXT: (local.set $2 @@ -164,7 +160,6 @@ ;; CHECK-NEXT: (local $3 (tuple i32 i32)) ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $e2 ;; CHECK-NEXT: (local.set $3 diff --git a/test/lit/basic/print-explicit-typeuse.wast b/test/lit/basic/print-explicit-typeuse.wast index d299a3eb4..367159f37 100644 --- a/test/lit/basic/print-explicit-typeuse.wast +++ b/test/lit/basic/print-explicit-typeuse.wast @@ -33,19 +33,15 @@ (import "" "" (func $rec-import (type $rec))) ;; CHECK: (func $mvp - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $mvp (type $mvp)) ;; CHECK: (func $open (type $open) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $open (type $open)) ;; CHECK: (func $shared (type $shared) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $shared (type $shared)) ;; CHECK: (func $rec (type $rec) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $rec (type $rec)) ) diff --git a/test/lit/basic/reference-types.wast b/test/lit/basic/reference-types.wast index 335939573..6ef51c23d 100644 --- a/test/lit/basic/reference-types.wast +++ b/test/lit/basic/reference-types.wast @@ -80,7 +80,6 @@ ;; CHECK-TEXT: (export "export_global" (global $import_global)) ;; CHECK-TEXT: (func $take_eqref (type $sig_eqref) (param $0 eqref) - ;; CHECK-TEXT-NEXT: (nop) ;; CHECK-TEXT-NEXT: ) ;; CHECK-BIN: (global $global_eqref (mut eqref) (ref.null none)) @@ -105,31 +104,24 @@ ;; CHECK-BIN: (export "export_global" (global $import_global)) ;; CHECK-BIN: (func $take_eqref (type $sig_eqref) (param $0 eqref) - ;; CHECK-BIN-NEXT: (nop) ;; CHECK-BIN-NEXT: ) (func $take_eqref (param eqref)) ;; CHECK-TEXT: (func $take_funcref (type $sig_funcref) (param $0 funcref) - ;; CHECK-TEXT-NEXT: (nop) ;; CHECK-TEXT-NEXT: ) ;; CHECK-BIN: (func $take_funcref (type $sig_funcref) (param $0 funcref) - ;; CHECK-BIN-NEXT: (nop) ;; CHECK-BIN-NEXT: ) (func $take_funcref (param funcref)) ;; CHECK-TEXT: (func $take_anyref (type $sig_anyref) (param $0 anyref) - ;; CHECK-TEXT-NEXT: (nop) ;; CHECK-TEXT-NEXT: ) ;; CHECK-BIN: (func $take_anyref (type $sig_anyref) (param $0 anyref) - ;; CHECK-BIN-NEXT: (nop) ;; CHECK-BIN-NEXT: ) (func $take_anyref (param anyref)) ;; CHECK-TEXT: (func $foo (type $5) - ;; CHECK-TEXT-NEXT: (nop) ;; CHECK-TEXT-NEXT: ) ;; CHECK-BIN: (func $foo (type $3) - ;; CHECK-BIN-NEXT: (nop) ;; CHECK-BIN-NEXT: ) (func $foo) @@ -2092,10 +2084,8 @@ ) ;; CHECK-TEXT: (func $ref-taken-but-not-in-table (type $5) - ;; CHECK-TEXT-NEXT: (nop) ;; CHECK-TEXT-NEXT: ) ;; CHECK-BIN: (func $ref-taken-but-not-in-table (type $3) - ;; CHECK-BIN-NEXT: (nop) ;; CHECK-BIN-NEXT: ) (func $ref-taken-but-not-in-table) ) @@ -2106,19 +2096,15 @@ ;; CHECK-BIN-NODEBUG: (export "export_global" (global $gimport$0)) ;; CHECK-BIN-NODEBUG: (func $0 (type $5) (param $0 eqref) -;; CHECK-BIN-NODEBUG-NEXT: (nop) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG: (func $1 (type $2) (param $0 funcref) -;; CHECK-BIN-NODEBUG-NEXT: (nop) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG: (func $2 (type $1) (param $0 anyref) -;; CHECK-BIN-NODEBUG-NEXT: (nop) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG: (func $3 (type $3) -;; CHECK-BIN-NODEBUG-NEXT: (nop) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG: (func $4 (type $3) @@ -2817,5 +2803,4 @@ ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG: (func $23 (type $3) -;; CHECK-BIN-NODEBUG-NEXT: (nop) ;; CHECK-BIN-NODEBUG-NEXT: ) diff --git a/test/lit/basic/shared-types.wast b/test/lit/basic/shared-types.wast index 25e593fd2..bcf9f6c54 100644 --- a/test/lit/basic/shared-types.wast +++ b/test/lit/basic/shared-types.wast @@ -30,7 +30,6 @@ ;; CHECK-NEXT: (local $3 (ref $bot)) ;; CHECK-NEXT: (local $4 (ref $func)) ;; CHECK-NEXT: (local $5 (ref $array)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $use-types (local (ref $final)) @@ -55,7 +54,6 @@ ;; CHECK-NEXT: (local $10 (ref (shared noextern))) ;; CHECK-NEXT: (local $11 (ref (shared nofunc))) ;; CHECK-NEXT: (local $12 (ref (shared noexn))) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $use-basic-types (local (ref (shared extern))) diff --git a/test/lit/basic/types-function-references.wast b/test/lit/basic/types-function-references.wast index 792536cfe..9500fa4c9 100644 --- a/test/lit/basic/types-function-references.wast +++ b/test/lit/basic/types-function-references.wast @@ -174,13 +174,11 @@ ;; CHECK-TEXT: (func $type-only-in-tuple-local (type $void) ;; CHECK-TEXT-NEXT: (local $x (tuple i32 (ref null $=>anyref) f64)) - ;; CHECK-TEXT-NEXT: (nop) ;; CHECK-TEXT-NEXT: ) ;; CHECK-BIN: (func $type-only-in-tuple-local (type $void) ;; CHECK-BIN-NEXT: (local $x i32) ;; CHECK-BIN-NEXT: (local $1 f64) ;; CHECK-BIN-NEXT: (local $2 (ref null $=>anyref)) - ;; CHECK-BIN-NEXT: (nop) ;; CHECK-BIN-NEXT: ) (func $type-only-in-tuple-local (local $x (tuple i32 (ref null $=>anyref) f64)) @@ -246,7 +244,6 @@ ;; CHECK-TEXT-NEXT: (local $i3 i64) ;; CHECK-TEXT-NEXT: (local $r5 anyref) ;; CHECK-TEXT-NEXT: (local $r6 funcref) - ;; CHECK-TEXT-NEXT: (nop) ;; CHECK-TEXT-NEXT: ) ;; CHECK-BIN: (func $ref-types-first (type $void) ;; CHECK-BIN-NEXT: (local $r1 (ref null $mixed_results)) @@ -258,7 +255,6 @@ ;; CHECK-BIN-NEXT: (local $i1 i32) ;; CHECK-BIN-NEXT: (local $i2 i64) ;; CHECK-BIN-NEXT: (local $i3 i64) - ;; CHECK-BIN-NEXT: (nop) ;; CHECK-BIN-NEXT: ) (func $ref-types-first ;; 6 reference types and 3 MVP types. The binary format should emit all the @@ -286,7 +282,6 @@ ;; CHECK-TEXT-NEXT: (local $i3 i64) ;; CHECK-TEXT-NEXT: (local $r5 anyref) ;; CHECK-TEXT-NEXT: (local $r6 funcref) - ;; CHECK-TEXT-NEXT: (nop) ;; CHECK-TEXT-NEXT: ) ;; CHECK-BIN: (func $mvp-types-first (type $void) ;; CHECK-BIN-NEXT: (local $i1 i32) @@ -298,7 +293,6 @@ ;; CHECK-BIN-NEXT: (local $r4 anyref) ;; CHECK-BIN-NEXT: (local $r5 anyref) ;; CHECK-BIN-NEXT: (local $r6 funcref) - ;; CHECK-BIN-NEXT: (nop) ;; CHECK-BIN-NEXT: ) (func $mvp-types-first ;; Reversed from before, now an MVP type appears first, so they should all @@ -324,7 +318,6 @@ ;; CHECK-TEXT-NEXT: (local $i3 i64) ;; CHECK-TEXT-NEXT: (local $r5 anyref) ;; CHECK-TEXT-NEXT: (local $r6 funcref) - ;; CHECK-TEXT-NEXT: (nop) ;; CHECK-TEXT-NEXT: ) ;; CHECK-BIN: (func $mvp-types-first-param (type $10) (param $r0 (ref null $mixed_results)) ;; CHECK-BIN-NEXT: (local $i1 i32) @@ -336,7 +329,6 @@ ;; CHECK-BIN-NEXT: (local $r4 anyref) ;; CHECK-BIN-NEXT: (local $r5 anyref) ;; CHECK-BIN-NEXT: (local $r6 funcref) - ;; CHECK-BIN-NEXT: (nop) ;; CHECK-BIN-NEXT: ) (func $mvp-types-first-param (param $r0 (ref null $mixed_results)) ;; As before, but now there is a reference type *parameter*. We should @@ -428,7 +420,6 @@ ;; CHECK-BIN-NODEBUG-NEXT: (local $0 i32) ;; CHECK-BIN-NODEBUG-NEXT: (local $1 f64) ;; CHECK-BIN-NODEBUG-NEXT: (local $2 (ref null $9)) -;; CHECK-BIN-NODEBUG-NEXT: (nop) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG: (func $8 (type $2) @@ -477,7 +468,6 @@ ;; CHECK-BIN-NODEBUG-NEXT: (local $6 i32) ;; CHECK-BIN-NODEBUG-NEXT: (local $7 i64) ;; CHECK-BIN-NODEBUG-NEXT: (local $8 i64) -;; CHECK-BIN-NODEBUG-NEXT: (nop) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG: (func $10 (type $2) @@ -490,7 +480,6 @@ ;; CHECK-BIN-NODEBUG-NEXT: (local $6 anyref) ;; CHECK-BIN-NODEBUG-NEXT: (local $7 anyref) ;; CHECK-BIN-NODEBUG-NEXT: (local $8 funcref) -;; CHECK-BIN-NODEBUG-NEXT: (nop) ;; CHECK-BIN-NODEBUG-NEXT: ) ;; CHECK-BIN-NODEBUG: (func $11 (type $10) (param $0 (ref null $0)) @@ -503,5 +492,4 @@ ;; CHECK-BIN-NODEBUG-NEXT: (local $7 anyref) ;; CHECK-BIN-NODEBUG-NEXT: (local $8 anyref) ;; CHECK-BIN-NODEBUG-NEXT: (local $9 funcref) -;; CHECK-BIN-NODEBUG-NEXT: (nop) ;; CHECK-BIN-NODEBUG-NEXT: ) diff --git a/test/lit/debug/source-map-smearing.wast b/test/lit/debug/source-map-smearing.wast index 875bec9d3..eeeb49fea 100644 --- a/test/lit/debug/source-map-smearing.wast +++ b/test/lit/debug/source-map-smearing.wast @@ -11,7 +11,7 @@ ;; Check that the debug locations do not smear beyond a function ;; epilogue to the next function. The encoded segment 'C' means that ;; the previous segment is indeed one-byte long. -;; CHECK: {"version":3,"sources":["foo"],"names":[],"mappings":"yBAAC,C,GACC"} +;; CHECK: {"version":3,"sources":["foo"],"names":[],"mappings":"wBAAC,C,EACC"} (module (func $0 ;;@ foo:1:1 diff --git a/test/lit/if-then-else.wast b/test/lit/if-then-else.wast index c1247af96..7fa59fad0 100644 --- a/test/lit/if-then-else.wast +++ b/test/lit/if-then-else.wast @@ -7,7 +7,6 @@ ;; CHECK-NEXT: (if ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: (then - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (else ;; CHECK-NEXT: (return @@ -23,7 +22,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (else - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (return diff --git a/test/lit/merge/chain.wat b/test/lit/merge/chain.wat index 528b20d0e..9faca1143 100644 --- a/test/lit/merge/chain.wat +++ b/test/lit/merge/chain.wat @@ -16,7 +16,6 @@ ;; CHECK: (export "h" (func $0_2)) ;; CHECK: (func $0 (type $0) -;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK: (func $0_2 (type $0) diff --git a/test/lit/merge/names.wat b/test/lit/merge/names.wat index 504dac102..6f51b54ca 100644 --- a/test/lit/merge/names.wat +++ b/test/lit/merge/names.wat @@ -89,7 +89,6 @@ ;; CHECK: (export "func2" (func $5)) ;; CHECK: (func $func0 (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $func0 (export "f0")) (func (export "f1")) @@ -117,21 +116,16 @@ (func (export "func") (param $x (ref $t))) ) ;; CHECK: (func $1 (type $0) -;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK: (func $2 (type $3) (param $x (ref $t)) -;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK: (func $func2 (type $0) -;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK: (func $4 (type $0) -;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK: (func $5 (type $4) (param $0 (ref $u)) -;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) diff --git a/test/lit/merge/renamings.wat b/test/lit/merge/renamings.wat index 9c54f3514..e680b276b 100644 --- a/test/lit/merge/renamings.wat +++ b/test/lit/merge/renamings.wat @@ -141,7 +141,6 @@ ;; CHECK: (func $uses (type $3) (param $array (ref $array)) ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $foo ;; CHECK-NEXT: (drop @@ -151,7 +150,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $bar ;; CHECK-NEXT: (drop @@ -323,7 +321,6 @@ ;; CHECK: (func $uses.second (type $3) (param $array (ref $array)) ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do -;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $foo_2 ;; CHECK-NEXT: (drop @@ -333,7 +330,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do -;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $other ;; CHECK-NEXT: (drop diff --git a/test/lit/merge/table64.wat b/test/lit/merge/table64.wat index a313b5bc3..e1e41dca9 100644 --- a/test/lit/merge/table64.wat +++ b/test/lit/merge/table64.wat @@ -15,5 +15,4 @@ ;; CHECK: (export "table" (table $table)) ;; CHECK: (func $second (type $0) -;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) diff --git a/test/lit/non-nullable-locals.wast b/test/lit/non-nullable-locals.wast index 21c12d4ad..6349a0ed4 100644 --- a/test/lit/non-nullable-locals.wast +++ b/test/lit/non-nullable-locals.wast @@ -15,7 +15,6 @@ ;; CHECK: (func $no-uses (type $0) ;; CHECK-NEXT: (local $x (ref func)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $no-uses ;; A local with no uses validates. @@ -171,7 +170,6 @@ ) ;; CHECK: (func $helper (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $helper) diff --git a/test/lit/passes/abstract-type-refining.wast b/test/lit/passes/abstract-type-refining.wast index e887894ea..5f6010ca0 100644 --- a/test/lit/passes/abstract-type-refining.wast +++ b/test/lit/passes/abstract-type-refining.wast @@ -242,7 +242,6 @@ ;; YESTNH-NEXT: (local $C (ref $C)) ;; YESTNH-NEXT: (local $D (ref $E)) ;; YESTNH-NEXT: (local $E (ref $E)) - ;; YESTNH-NEXT: (nop) ;; YESTNH-NEXT: ) ;; NO_TNH: (func $locals (type $6) ;; NO_TNH-NEXT: (local $A (ref $A)) @@ -250,7 +249,6 @@ ;; NO_TNH-NEXT: (local $C (ref $C)) ;; NO_TNH-NEXT: (local $D (ref $D)) ;; NO_TNH-NEXT: (local $E (ref $E)) - ;; NO_TNH-NEXT: (nop) ;; NO_TNH-NEXT: ) (func $locals ;; Local variable types are also updated. @@ -799,14 +797,12 @@ ;; YESTNH-NEXT: (local $B (ref none)) ;; YESTNH-NEXT: (local $C1 (ref none)) ;; YESTNH-NEXT: (local $C2 nullref) - ;; YESTNH-NEXT: (nop) ;; YESTNH-NEXT: ) ;; NO_TNH: (func $locals (type $1) ;; NO_TNH-NEXT: (local $A (ref none)) ;; NO_TNH-NEXT: (local $B (ref none)) ;; NO_TNH-NEXT: (local $C1 (ref none)) ;; NO_TNH-NEXT: (local $C2 nullref) - ;; NO_TNH-NEXT: (nop) ;; NO_TNH-NEXT: ) (func $locals ;; All these locals can become nullable or even non-nullable null types. @@ -1002,21 +998,17 @@ ;; YESTNH: (type $3 (func (param funcref))) ;; YESTNH: (func $A (type $A) - ;; YESTNH-NEXT: (nop) ;; YESTNH-NEXT: ) ;; NO_TNH: (type $3 (func (param funcref))) ;; NO_TNH: (func $A (type $A) - ;; NO_TNH-NEXT: (nop) ;; NO_TNH-NEXT: ) (func $A (type $A) ) ;; YESTNH: (func $C (type $A) - ;; YESTNH-NEXT: (nop) ;; YESTNH-NEXT: ) ;; NO_TNH: (func $C (type $A) - ;; NO_TNH-NEXT: (nop) ;; NO_TNH-NEXT: ) (func $C (type $A) ) diff --git a/test/lit/passes/asyncify_enable-multivalue.wast b/test/lit/passes/asyncify_enable-multivalue.wast index f29edd4a5..86a8bc47e 100644 --- a/test/lit/passes/asyncify_enable-multivalue.wast +++ b/test/lit/passes/asyncify_enable-multivalue.wast @@ -193,7 +193,6 @@ (call $stuff) ;; do some more work ) ;; CHECK: (func $stuff - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $stuff) ;; the first event called from the main event loop: just call into $work @@ -2484,7 +2483,6 @@ (call $import) ) ;; CHECK: (func $boring - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $boring) ;; CHECK: (func $calls-mix-deep diff --git a/test/lit/passes/asyncify_optimize-level=1.wast b/test/lit/passes/asyncify_optimize-level=1.wast index d7627f407..4839b08bb 100644 --- a/test/lit/passes/asyncify_optimize-level=1.wast +++ b/test/lit/passes/asyncify_optimize-level=1.wast @@ -1425,7 +1425,6 @@ (call $import) ) ;; CHECK: (func $boring - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $boring) ;; CHECK: (func $calls-mix-deep diff --git a/test/lit/passes/asyncify_pass-arg=asyncify-addlist@foo.wast b/test/lit/passes/asyncify_pass-arg=asyncify-addlist@foo.wast index 92dbe2bb2..2803d243d 100644 --- a/test/lit/passes/asyncify_pass-arg=asyncify-addlist@foo.wast +++ b/test/lit/passes/asyncify_pass-arg=asyncify-addlist@foo.wast @@ -114,7 +114,6 @@ (call $nothing) ) ;; CHECK: (func $nothing - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $nothing ) diff --git a/test/lit/passes/asyncify_pass-arg=asyncify-addlist@foo_pass-arg=asyncify-ignore-indirect.wast b/test/lit/passes/asyncify_pass-arg=asyncify-addlist@foo_pass-arg=asyncify-ignore-indirect.wast index 81107cb16..5f4fb89de 100644 --- a/test/lit/passes/asyncify_pass-arg=asyncify-addlist@foo_pass-arg=asyncify-ignore-indirect.wast +++ b/test/lit/passes/asyncify_pass-arg=asyncify-addlist@foo_pass-arg=asyncify-ignore-indirect.wast @@ -155,7 +155,6 @@ (call_indirect (type $t) (i32.const 0)) ) ;; CHECK: (func $nothing - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $nothing ) diff --git a/test/lit/passes/asyncify_pass-arg=asyncify-addlist@foo_pass-arg=asyncify-propagate-addlist.wast b/test/lit/passes/asyncify_pass-arg=asyncify-addlist@foo_pass-arg=asyncify-propagate-addlist.wast index b0b758b49..37075e800 100644 --- a/test/lit/passes/asyncify_pass-arg=asyncify-addlist@foo_pass-arg=asyncify-propagate-addlist.wast +++ b/test/lit/passes/asyncify_pass-arg=asyncify-addlist@foo_pass-arg=asyncify-propagate-addlist.wast @@ -113,7 +113,6 @@ (call $nothing) ) ;; CHECK: (func $nothing - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $nothing ) diff --git a/test/lit/passes/asyncify_pass-arg=asyncify-imports@env.import,env.import2.wast b/test/lit/passes/asyncify_pass-arg=asyncify-imports@env.import,env.import2.wast index 801ab5eb9..36e1aa68c 100644 --- a/test/lit/passes/asyncify_pass-arg=asyncify-imports@env.import,env.import2.wast +++ b/test/lit/passes/asyncify_pass-arg=asyncify-imports@env.import,env.import2.wast @@ -193,7 +193,6 @@ (call $stuff) ;; do some more work ) ;; CHECK: (func $stuff - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $stuff) ;; the first event called from the main event loop: just call into $work @@ -1610,7 +1609,6 @@ (call $import) ) ;; CHECK: (func $boring - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $boring) ;; CHECK: (func $calls-mix-deep diff --git a/test/lit/passes/coalesce-locals-eh-legacy.wast b/test/lit/passes/coalesce-locals-eh-legacy.wast index 9091fdcb9..b5b41b661 100644 --- a/test/lit/passes/coalesce-locals-eh-legacy.wast +++ b/test/lit/passes/coalesce-locals-eh-legacy.wast @@ -50,7 +50,6 @@ ;; CHECK-NEXT: (local $0 anyref) ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $any ;; CHECK-NEXT: (drop diff --git a/test/lit/passes/code-folding-eh-legacy.wast b/test/lit/passes/code-folding-eh-legacy.wast index 852ec126a..81180d044 100644 --- a/test/lit/passes/code-folding-eh-legacy.wast +++ b/test/lit/passes/code-folding-eh-legacy.wast @@ -12,7 +12,6 @@ ;; CHECK-NEXT: (do ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $e-i32 ;; CHECK-NEXT: (drop @@ -112,7 +111,6 @@ ;; CHECK: (func $foo (type $1) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo) diff --git a/test/lit/passes/code-folding-eh.wast b/test/lit/passes/code-folding-eh.wast index 5a7cd68c7..94eb0b38d 100644 --- a/test/lit/passes/code-folding-eh.wast +++ b/test/lit/passes/code-folding-eh.wast @@ -53,7 +53,6 @@ ;; CHECK: (func $foo (type $1) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo) diff --git a/test/lit/passes/code-pushing-eh-legacy.wast b/test/lit/passes/code-pushing-eh-legacy.wast index 9511d244a..06b2e3e71 100644 --- a/test/lit/passes/code-pushing-eh-legacy.wast +++ b/test/lit/passes/code-pushing-eh-legacy.wast @@ -17,7 +17,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch_all - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (drop @@ -53,7 +52,6 @@ ) ;; CHECK: (func $foo (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo) @@ -166,7 +164,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch_all - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (drop @@ -224,7 +221,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch_all - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (drop diff --git a/test/lit/passes/code-pushing-eh.wast b/test/lit/passes/code-pushing-eh.wast index ee2798c46..3c6d005b1 100644 --- a/test/lit/passes/code-pushing-eh.wast +++ b/test/lit/passes/code-pushing-eh.wast @@ -118,7 +118,6 @@ ) ;; CHECK: (func $foo (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo) diff --git a/test/lit/passes/dae-gc-refine-params.wast b/test/lit/passes/dae-gc-refine-params.wast index f9e9c4651..8cefbe881 100644 --- a/test/lit/passes/dae-gc-refine-params.wast +++ b/test/lit/passes/dae-gc-refine-params.wast @@ -316,7 +316,6 @@ ;; CHECK: (func $unused-and-refinable (type $2) ;; CHECK-NEXT: (local $0 structref) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $unused-and-refinable (param $0 structref) ;; This function does not use $0. It is called with $"{}", so it is also diff --git a/test/lit/passes/dae-gc.wast b/test/lit/passes/dae-gc.wast index 987823020..1f39567d1 100644 --- a/test/lit/passes/dae-gc.wast +++ b/test/lit/passes/dae-gc.wast @@ -155,15 +155,12 @@ ;; Helper functions so we have something to take the reference of. ;; CHECK: (func $a (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $a) ;; CHECK: (func $b (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $b) ;; CHECK: (func $c (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $c) ) diff --git a/test/lit/passes/dae_all-features.wast b/test/lit/passes/dae_all-features.wast index da9558dd8..145ae1ff0 100644 --- a/test/lit/passes/dae_all-features.wast +++ b/test/lit/passes/dae_all-features.wast @@ -33,7 +33,8 @@ ;; CHECK-NEXT: (local.set $0 ;; CHECK-NEXT: (i32.const 1) ;; CHECK-NEXT: ) - ;; CHECK-NEXT: (nop) + ;; CHECK-NEXT: (block + ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) (func $a (param $x i32)) ;; CHECK: (func $b (type $0) @@ -114,7 +115,8 @@ ;; CHECK-NEXT: (local.set $0 ;; CHECK-NEXT: (i32.const 4) ;; CHECK-NEXT: ) - ;; CHECK-NEXT: (nop) + ;; CHECK-NEXT: (block + ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) (func $a4 (param $x i32) ;; This function is called with one constant and one unreachable. We can @@ -219,7 +221,6 @@ (call $a7 (i32.const 1) (call $get-f64)) ) ;; CHECK: (func $a8 (type $1) (param $x i32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $a8 (param $x i32)) ;; exported, do not optimize ;; CHECK: (func $b8 (type $0) @@ -231,7 +232,6 @@ (call $a8 (i32.const 1)) ) ;; CHECK: (func $a9 (type $1) (param $x i32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $a9 (param $x i32)) ;; tabled, do not optimize ;; CHECK: (func $b9 (type $0) diff --git a/test/lit/passes/dae_tnh.wast b/test/lit/passes/dae_tnh.wast index 2bba6570b..6e78283fd 100644 --- a/test/lit/passes/dae_tnh.wast +++ b/test/lit/passes/dae_tnh.wast @@ -57,7 +57,6 @@ ) ;; CHECK: (func $target (type $1) (param $0 i32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $target (param i32) ) @@ -105,7 +104,6 @@ ) ;; CHECK: (func $target (type $1) (param $0 i32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $target (param i32) ) diff --git a/test/lit/passes/dce-eh-legacy.wast b/test/lit/passes/dce-eh-legacy.wast index 107c35609..31ba4fac2 100644 --- a/test/lit/passes/dce-eh-legacy.wast +++ b/test/lit/passes/dce-eh-legacy.wast @@ -25,7 +25,6 @@ (tag $e-eqref (param (ref null eq))) ;; CHECK: (func $foo (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo) @@ -35,7 +34,6 @@ ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch_all - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (call $foo) @@ -53,7 +51,6 @@ ;; CHECK: (func $catch_unreachable (type $0) ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch_all ;; CHECK-NEXT: (unreachable) @@ -96,7 +93,6 @@ ;; CHECK: (func $rethrow (type $0) ;; CHECK-NEXT: (try $l0 ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $e ;; CHECK-NEXT: (drop diff --git a/test/lit/passes/dce-eh.wast b/test/lit/passes/dce-eh.wast index 413a278d0..b2742913b 100644 --- a/test/lit/passes/dce-eh.wast +++ b/test/lit/passes/dce-eh.wast @@ -11,7 +11,6 @@ (tag $e-i32 (param i32)) ;; CHECK: (func $foo (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo) diff --git a/test/lit/passes/denan.wast b/test/lit/passes/denan.wast index bc42ab04e..9f167b15d 100644 --- a/test/lit/passes/denan.wast +++ b/test/lit/passes/denan.wast @@ -59,7 +59,8 @@ ;; CHECK-NEXT: (local.get $w) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; CHECK-NEXT: (nop) + ;; CHECK-NEXT: (block + ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) (func $various (param $x i32) (param $y f32) (param $z i64) (param $w f64) ) @@ -251,11 +252,9 @@ ;; CHECK: (type $2 (func (param f64) (result f64))) ;; CHECK: (func $deNan32 - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $deNan32) ;; CHECK: (func $deNan64 - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $deNan64) ;; CHECK: (func $foo32 (param $x f32) (result f32) diff --git a/test/lit/passes/flatten-eh-legacy.wast b/test/lit/passes/flatten-eh-legacy.wast index 56057b779..34b5cf08b 100644 --- a/test/lit/passes/flatten-eh-legacy.wast +++ b/test/lit/passes/flatten-eh-legacy.wast @@ -61,7 +61,6 @@ ;; CHECK-NEXT: (block $l0 ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $e-i32 ;; CHECK-NEXT: (local.set $1 diff --git a/test/lit/passes/flatten_i64-to-i32-lowering.wast b/test/lit/passes/flatten_i64-to-i32-lowering.wast index 5a185cc0a..e5e556c79 100644 --- a/test/lit/passes/flatten_i64-to-i32-lowering.wast +++ b/test/lit/passes/flatten_i64-to-i32-lowering.wast @@ -480,7 +480,6 @@ ;; CHECK: (export "unreach" (func $unreach)) ;; CHECK: (func $call (type $1) (param $0 i32) (param $0$hi i32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $call (param i64)) ;; CHECK: (func $exp (type $0) @@ -586,7 +585,6 @@ ;; CHECK: (export "exp" (func $exp)) ;; CHECK: (func $call (type $0) (param $0 i32) (param $0$hi i32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $call (param i64)) ;; CHECK: (func $exp (type $1) diff --git a/test/lit/passes/flatten_simplify-locals-nonesting_souperify-single-use_enable-threads.wast b/test/lit/passes/flatten_simplify-locals-nonesting_souperify-single-use_enable-threads.wast index 76b4e6e51..f71970035 100644 --- a/test/lit/passes/flatten_simplify-locals-nonesting_souperify-single-use_enable-threads.wast +++ b/test/lit/passes/flatten_simplify-locals-nonesting_souperify-single-use_enable-threads.wast @@ -2477,7 +2477,6 @@ ;; CHECK-NEXT: (i32.const 2) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (loop $loopy - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: (nop) diff --git a/test/lit/passes/flatten_simplify-locals-nonesting_souperify_enable-threads.wast b/test/lit/passes/flatten_simplify-locals-nonesting_souperify_enable-threads.wast index 5c11e34e3..d57df6579 100644 --- a/test/lit/passes/flatten_simplify-locals-nonesting_souperify_enable-threads.wast +++ b/test/lit/passes/flatten_simplify-locals-nonesting_souperify_enable-threads.wast @@ -318,7 +318,6 @@ ) ) ;; CHECK: (func $send-i32 (param $0 i32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $send-i32 (param i32)) ;; flipping of greater than/or equals ops, which are not in Souper IR @@ -2545,7 +2544,6 @@ ;; CHECK-NEXT: (i32.const 2) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (loop $loopy - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: (nop) diff --git a/test/lit/passes/fpcast-emu.wast b/test/lit/passes/fpcast-emu.wast index 8ded82647..9da081c4a 100644 --- a/test/lit/passes/fpcast-emu.wast +++ b/test/lit/passes/fpcast-emu.wast @@ -370,19 +370,15 @@ ;; CHECK: (export "dynCall_vd" (func $min_vd)) (export "dynCall_vd" (func $min_vd)) ;; CHECK: (func $a (param $0 f32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $a (param $0 f32)) ;; CHECK: (func $b (param $0 f64) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $b (param $0 f64)) ;; CHECK: (func $dynCall_vf (param $0 f32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $dynCall_vf (param $0 f32)) ;; CHECK: (func $min_vd (param $0 f32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $min_vd (param $0 f32)) ) diff --git a/test/lit/passes/global-refining.wast b/test/lit/passes/global-refining.wast index 1ede2009e..927dfd1f2 100644 --- a/test/lit/passes/global-refining.wast +++ b/test/lit/passes/global-refining.wast @@ -18,10 +18,8 @@ ;; CLOSD: (global $func-func-init (mut (ref $foo_t)) (ref.func $foo)) (global $func-func-init (mut funcref) (ref.func $foo)) ;; CHECK: (func $foo (type $foo_t) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CLOSD: (func $foo (type $foo_t) - ;; CLOSD-NEXT: (nop) ;; CLOSD-NEXT: ) (func $foo (type $foo_t)) ) @@ -188,10 +186,8 @@ (global $b (ref $super) (global.get $a)) ;; CHECK: (func $func (type $sub) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CLOSD: (func $func (type $sub) - ;; CLOSD-NEXT: (nop) ;; CLOSD-NEXT: ) (func $func (type $sub) ) diff --git a/test/lit/passes/gto-removals.wast b/test/lit/passes/gto-removals.wast index 99579f8ab..a6fd9c228 100644 --- a/test/lit/passes/gto-removals.wast +++ b/test/lit/passes/gto-removals.wast @@ -12,7 +12,6 @@ ;; CHECK: (type $1 (func (param (ref $struct)))) ;; CHECK: (func $func (type $1) (param $x (ref $struct)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $func (param $x (ref $struct)) ) @@ -328,23 +327,18 @@ ) ;; CHECK: (func $func-0 (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $func-0) ;; CHECK: (func $func-1 (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $func-1) ;; CHECK: (func $func-2 (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $func-2) ;; CHECK: (func $func-3 (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $func-3) ;; CHECK: (func $func-4 (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $func-4) ) @@ -1254,7 +1248,6 @@ ;; CHECK: (type $2 (func (param (ref $B)))) ;; CHECK: (func $func (type $2) (param $x (ref $B)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $func (param $x (ref $B)) ;; Use $B in a param to keep it alive, and lead us to process it and $A. @@ -1273,7 +1266,6 @@ ;; CHECK: (type $2 (func (param (ref $B)))) ;; CHECK: (func $func (type $2) (param $x (ref $B)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $func (param $x (ref $B)) ) diff --git a/test/lit/passes/gufa-refs.wast b/test/lit/passes/gufa-refs.wast index 6722d0ed4..9772745bc 100644 --- a/test/lit/passes/gufa-refs.wast +++ b/test/lit/passes/gufa-refs.wast @@ -1917,7 +1917,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $nothing ;; CHECK-NEXT: (local.set $0 @@ -1943,7 +1942,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $something ;; CHECK-NEXT: (drop @@ -2146,7 +2144,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $tag ;; CHECK-NEXT: (local.set $0 @@ -2164,7 +2161,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $tag ;; CHECK-NEXT: (drop @@ -2393,7 +2389,6 @@ ) ;; CHECK: (func $foo (type $1) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo) ) diff --git a/test/lit/passes/heap2local.wast b/test/lit/passes/heap2local.wast index 179437c38..bad4a33bf 100644 --- a/test/lit/passes/heap2local.wast +++ b/test/lit/passes/heap2local.wast @@ -485,7 +485,6 @@ ) ;; CHECK: (func $send-ref (type $5) (param $0 (ref null $struct.A)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $send-ref (param (ref null $struct.A)) ) diff --git a/test/lit/passes/inlining-eh-legacy.wast b/test/lit/passes/inlining-eh-legacy.wast index 9135f786e..4d9d3a7aa 100644 --- a/test/lit/passes/inlining-eh-legacy.wast +++ b/test/lit/passes/inlining-eh-legacy.wast @@ -25,7 +25,6 @@ ;; CHECK-NEXT: (block $__inlined_func$callee-with-label ;; CHECK-NEXT: (try $label0 ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $tag$0 ;; CHECK-NEXT: (drop @@ -52,7 +51,6 @@ ;; CHECK: (func $callee-with-try-delegate (type $0) ;; CHECK-NEXT: (try $label$3 ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (delegate 0) ;; CHECK-NEXT: ) @@ -83,7 +81,6 @@ ;; CHECK: (func $caller-with-try-delegate (type $2) (result i32) ;; CHECK-NEXT: (try $label$3 ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (delegate 0) ;; CHECK-NEXT: ) @@ -107,14 +104,14 @@ ;; CHECK-NEXT: (local $0 i32) ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $tag$0 ;; CHECK-NEXT: (block $__inlined_func$callee-b$2 ;; CHECK-NEXT: (local.set $0 ;; CHECK-NEXT: (pop i32) ;; CHECK-NEXT: ) - ;; CHECK-NEXT: (nop) + ;; CHECK-NEXT: (block + ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) @@ -144,7 +141,6 @@ ;; CHECK-NEXT: (local $2 i32) ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $tag$0 ;; CHECK-NEXT: (local.set $2 @@ -159,7 +155,8 @@ ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; CHECK-NEXT: (nop) + ;; CHECK-NEXT: (block + ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) diff --git a/test/lit/passes/inlining-gc.wast b/test/lit/passes/inlining-gc.wast index 8da522e1d..445cbf042 100644 --- a/test/lit/passes/inlining-gc.wast +++ b/test/lit/passes/inlining-gc.wast @@ -8,7 +8,8 @@ ;; CHECK-NEXT: (local.set $0 ;; CHECK-NEXT: (ref.null nofunc) ;; CHECK-NEXT: ) - ;; CHECK-NEXT: (nop) + ;; CHECK-NEXT: (block + ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) (func $caller-nullable @@ -27,7 +28,8 @@ ;; CHECK: (func $caller-non-nullable (type $0) ;; CHECK-NEXT: (local $0 (ref func)) ;; CHECK-NEXT: (block $__inlined_func$target-non-nullable$1 - ;; CHECK-NEXT: (nop) + ;; CHECK-NEXT: (block + ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) (func $caller-non-nullable diff --git a/test/lit/passes/inlining_all-features.wast b/test/lit/passes/inlining_all-features.wast index 38d24ab72..860f5b8f7 100644 --- a/test/lit/passes/inlining_all-features.wast +++ b/test/lit/passes/inlining_all-features.wast @@ -15,13 +15,13 @@ ;; $foo should not be removed after being inlined, because there is 'ref.func' ;; instruction that refers to it ;; CHECK: (func $foo (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo) ;; CHECK: (func $ref_func_test (type $1) (result funcref) ;; CHECK-NEXT: (block $__inlined_func$foo - ;; CHECK-NEXT: (nop) + ;; CHECK-NEXT: (block + ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (ref.func $foo) ;; CHECK-NEXT: ) @@ -160,7 +160,8 @@ ;; CHECK-NEXT: (local.get $0) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; CHECK-NEXT: (nop) + ;; CHECK-NEXT: (block + ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) (func $caller-with-pop-twice diff --git a/test/lit/passes/inlining_splitting.wast b/test/lit/passes/inlining_splitting.wast index 84c0b9832..f3d7f44a4 100644 --- a/test/lit/passes/inlining_splitting.wast +++ b/test/lit/passes/inlining_splitting.wast @@ -856,7 +856,6 @@ ) ;; CHECK: (func $byn-split-outlined-A$colliding-name (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $byn-split-outlined-A$colliding-name ;; This function's name might collide with the split function we create for diff --git a/test/lit/passes/instrument-locals-eh-legacy.wast b/test/lit/passes/instrument-locals-eh-legacy.wast index 8ee553554..23d944a0c 100644 --- a/test/lit/passes/instrument-locals-eh-legacy.wast +++ b/test/lit/passes/instrument-locals-eh-legacy.wast @@ -9,7 +9,6 @@ ;; CHECK-NEXT: (local $x i32) ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $e ;; CHECK-NEXT: (local.set $x diff --git a/test/lit/passes/j2cl-merge-itables.wast b/test/lit/passes/j2cl-merge-itables.wast index 499f598e1..8506724fd 100644 --- a/test/lit/passes/j2cl-merge-itables.wast +++ b/test/lit/passes/j2cl-merge-itables.wast @@ -65,7 +65,6 @@ (struct.new $Object.vtable)) ;; CHECK: (func $SubObject.f (type $function) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $SubObject.f (type $function) @@ -180,7 +179,6 @@ (struct.new_default $Object.itable)) ;; CHECK: (func $SubObject.f (type $function) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $SubObject.f (type $function) diff --git a/test/lit/passes/j2cl.wast b/test/lit/passes/j2cl.wast index 4fe661e5c..e17d9f43c 100644 --- a/test/lit/passes/j2cl.wast +++ b/test/lit/passes/j2cl.wast @@ -212,7 +212,6 @@ ;; CHECK: (func $notOnceFunction@Zoo (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $notOnceFunction@Zoo ) @@ -225,7 +224,6 @@ ) ;; CHECK: (func $empty_<once>_@Zoo (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $empty_<once>_@Zoo ) @@ -255,7 +253,8 @@ ;; CHECK: (func $caller_@Zoo (type $1) (result i32) ;; CHECK-NEXT: (nop) - ;; CHECK-NEXT: (nop) + ;; CHECK-NEXT: (block + ;; CHECK-NEXT: ) ;; CHECK-NEXT: (call $notOnceFunction@Zoo) ;; CHECK-NEXT: (global.set $$var2@Zoo ;; CHECK-NEXT: (i32.const 3) diff --git a/test/lit/passes/legalize-js-interface-exported-helpers.wast b/test/lit/passes/legalize-js-interface-exported-helpers.wast index 707cbe5c9..bed768f1a 100644 --- a/test/lit/passes/legalize-js-interface-exported-helpers.wast +++ b/test/lit/passes/legalize-js-interface-exported-helpers.wast @@ -31,7 +31,6 @@ (i64.const 0) ) ;; CHECK: (func $__set_temp_ret (param $0 i32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $__set_temp_ret (param i32)) ;; CHECK: (func $__get_temp_ret (result i32) diff --git a/test/lit/passes/local-cse_all-features.wast b/test/lit/passes/local-cse_all-features.wast index 8878d595f..e8d7da4c7 100644 --- a/test/lit/passes/local-cse_all-features.wast +++ b/test/lit/passes/local-cse_all-features.wast @@ -509,7 +509,6 @@ ) ;; CHECK: (func $callee (type $2) (param $x i32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $callee (param $x i32) ) diff --git a/test/lit/passes/monomorphize-context.wast b/test/lit/passes/monomorphize-context.wast index cc4bdfc9d..7f9cb2f56 100644 --- a/test/lit/passes/monomorphize-context.wast +++ b/test/lit/passes/monomorphize-context.wast @@ -177,7 +177,6 @@ ) ;; ALWAYS: (func $target (type $1) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32) (param $6 i32) (param $7 i32) (param $8 i32) (param $9 i32) (param $10 anyref) (param $11 funcref) (param $12 i32) (param $13 f64) (param $14 i32) (param $15 anyref) (param $16 anyref) - ;; ALWAYS-NEXT: (nop) ;; ALWAYS-NEXT: ) ;; CAREFUL: (func $target (type $1) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32) (param $6 i32) (param $7 i32) (param $8 i32) (param $9 i32) (param $10 anyref) (param $11 funcref) (param $12 i32) (param $13 f64) (param $14 i32) (param $15 anyref) (param $16 anyref) ;; CAREFUL-NEXT: (nop) @@ -285,7 +284,8 @@ ;; ALWAYS-NEXT: (local.set $22 ;; ALWAYS-NEXT: (struct.new_default $struct) ;; ALWAYS-NEXT: ) -;; ALWAYS-NEXT: (nop) +;; ALWAYS-NEXT: (block +;; ALWAYS-NEXT: ) ;; ALWAYS-NEXT: ) ;; CAREFUL: (func $target_2 (type $2) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32) @@ -1333,7 +1333,6 @@ ) ;; ALWAYS: (func $target (type $1) (param $0 i32) (param $1 i32) - ;; ALWAYS-NEXT: (nop) ;; ALWAYS-NEXT: ) ;; CAREFUL: (func $target (type $1) (param $0 i32) (param $1 i32) ;; CAREFUL-NEXT: (nop) @@ -1353,7 +1352,8 @@ ;; ALWAYS-NEXT: (i32.const 0) ;; ALWAYS-NEXT: ) ;; ALWAYS-NEXT: ) -;; ALWAYS-NEXT: (nop) +;; ALWAYS-NEXT: (block +;; ALWAYS-NEXT: ) ;; ALWAYS-NEXT: ) (module (memory 10 20) @@ -1414,7 +1414,6 @@ ) ;; ALWAYS: (func $target (type $0) (param $0 i32) - ;; ALWAYS-NEXT: (nop) ;; ALWAYS-NEXT: ) ;; CAREFUL: (func $target (type $1) (param $0 i32) ;; CAREFUL-NEXT: (nop) @@ -1432,7 +1431,8 @@ ;; ALWAYS-NEXT: (i32.const 1) ;; ALWAYS-NEXT: ) ;; ALWAYS-NEXT: ) -;; ALWAYS-NEXT: (nop) +;; ALWAYS-NEXT: (block +;; ALWAYS-NEXT: ) ;; ALWAYS-NEXT: ) (module ;; ALWAYS: (type $0 (func)) @@ -1551,7 +1551,6 @@ ) ;; ALWAYS: (func $target (type $2) (param $0 anyref) - ;; ALWAYS-NEXT: (nop) ;; ALWAYS-NEXT: ) ;; CAREFUL: (func $target (type $1) (param $0 anyref) ;; CAREFUL-NEXT: (nop) @@ -1569,7 +1568,8 @@ ;; ALWAYS-NEXT: (local.get $1) ;; ALWAYS-NEXT: ) ;; ALWAYS-NEXT: ) -;; ALWAYS-NEXT: (nop) +;; ALWAYS-NEXT: (block +;; ALWAYS-NEXT: ) ;; ALWAYS-NEXT: ) ;; ALWAYS: (func $target_4 (type $4) (param $0 i32) @@ -1582,7 +1582,8 @@ ;; ALWAYS-NEXT: ) ;; ALWAYS-NEXT: ) ;; ALWAYS-NEXT: ) -;; ALWAYS-NEXT: (nop) +;; ALWAYS-NEXT: (block +;; ALWAYS-NEXT: ) ;; ALWAYS-NEXT: ) ;; CAREFUL: (func $target_3 (type $2) (param $0 i32) (param $1 i32) @@ -1719,7 +1720,6 @@ ) ;; ALWAYS: (func $target (type $1) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32) - ;; ALWAYS-NEXT: (nop) ;; ALWAYS-NEXT: ) ;; CAREFUL: (func $target (type $1) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32) ;; CAREFUL-NEXT: (nop) @@ -1756,7 +1756,8 @@ ;; ALWAYS-NEXT: (i32.const 0) ;; ALWAYS-NEXT: ) ;; ALWAYS-NEXT: ) -;; ALWAYS-NEXT: (nop) +;; ALWAYS-NEXT: (block +;; ALWAYS-NEXT: ) ;; ALWAYS-NEXT: ) (module ;; ALWAYS: (type $0 (func)) @@ -1795,10 +1796,8 @@ ) ;; ALWAYS: (func $target (type $1) (param $0 f32) - ;; ALWAYS-NEXT: (nop) ;; ALWAYS-NEXT: ) ;; CAREFUL: (func $target (type $1) (param $0 f32) - ;; CAREFUL-NEXT: (nop) ;; CAREFUL-NEXT: ) (func $target (param $0 f32) ) diff --git a/test/lit/passes/monomorphize-limits.wast b/test/lit/passes/monomorphize-limits.wast index 344f55b51..29dd9de20 100644 --- a/test/lit/passes/monomorphize-limits.wast +++ b/test/lit/passes/monomorphize-limits.wast @@ -112,7 +112,6 @@ ) ;; ALWAYS: (func $many-params (type $1) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32) (param $6 i32) (param $7 i32) (param $8 i32) (param $9 i32) (param $10 i32) (param $11 i32) (param $12 i32) (param $13 i32) (param $14 i32) (param $15 i32) (param $16 i32) (param $17 i32) (param $18 i32) (param $19 i32) (param $20 i32) (param $21 i32) (param $22 i32) (param $23 i32) (param $24 i32) - ;; ALWAYS-NEXT: (nop) ;; ALWAYS-NEXT: ) ;; CAREFUL: (func $many-params (type $1) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (param $5 i32) (param $6 i32) (param $7 i32) (param $8 i32) (param $9 i32) (param $10 i32) (param $11 i32) (param $12 i32) (param $13 i32) (param $14 i32) (param $15 i32) (param $16 i32) (param $17 i32) (param $18 i32) (param $19 i32) (param $20 i32) (param $21 i32) (param $22 i32) (param $23 i32) (param $24 i32) ;; CAREFUL-NEXT: (nop) @@ -227,7 +226,8 @@ ;; ALWAYS-NEXT: (local.set $24 ;; ALWAYS-NEXT: (i32.const 25) ;; ALWAYS-NEXT: ) -;; ALWAYS-NEXT: (nop) +;; ALWAYS-NEXT: (block +;; ALWAYS-NEXT: ) ;; ALWAYS-NEXT: ) ;; CAREFUL: (func $many-params_3 (type $0) @@ -353,7 +353,6 @@ ) ;; ALWAYS: (func $target (type $3) (param $array (ref $array)) - ;; ALWAYS-NEXT: (nop) ;; ALWAYS-NEXT: ) ;; CAREFUL: (func $target (type $3) (param $0 (ref $array)) ;; CAREFUL-NEXT: (nop) @@ -392,7 +391,8 @@ ;; ALWAYS-NEXT: (i32.const 25) ;; ALWAYS-NEXT: ) ;; ALWAYS-NEXT: ) -;; ALWAYS-NEXT: (nop) +;; ALWAYS-NEXT: (block +;; ALWAYS-NEXT: ) ;; ALWAYS-NEXT: ) ;; CAREFUL: (func $target_3 (type $1) diff --git a/test/lit/passes/name-types.wast b/test/lit/passes/name-types.wast index bb31ffc82..bde56309f 100644 --- a/test/lit/passes/name-types.wast +++ b/test/lit/passes/name-types.wast @@ -34,7 +34,6 @@ ;; CHECK: (type $type (func (param (ref $type_1) (ref $reasonable-name) (ref $lintable-name) (ref $unlintable-name_7) (ref $unlintable-name) (ref $onelintable-name) (ref $onelintable-name_8)))) ;; CHECK: (func $foo (type $type) (param $x (ref $type_1)) (param $y (ref $reasonable-name)) (param $z (ref $lintable-name)) (param $w (ref $unlintable-name_7)) (param $t (ref $unlintable-name)) (param $a (ref $onelintable-name)) (param $b (ref $onelintable-name_8)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo ;; Use the types to keep them alive. diff --git a/test/lit/passes/once-reduction.wast b/test/lit/passes/once-reduction.wast index af9f4f113..640d14461 100644 --- a/test/lit/passes/once-reduction.wast +++ b/test/lit/passes/once-reduction.wast @@ -201,7 +201,6 @@ ) ;; CHECK: (func $caller-empty (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $caller-empty ;; A tiny function with nothing at all, just to verify we do not crash on @@ -1481,7 +1480,6 @@ ) ;; CHECK: (func $bad-B (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $bad-B ) @@ -2022,7 +2020,6 @@ ) ;; CHECK: (func $other (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $other ) diff --git a/test/lit/passes/optimize-casts-noeh.wast b/test/lit/passes/optimize-casts-noeh.wast index 3cee5f3d4..3c3b5f8c5 100644 --- a/test/lit/passes/optimize-casts-noeh.wast +++ b/test/lit/passes/optimize-casts-noeh.wast @@ -63,7 +63,6 @@ ) ;; CHECK: (func $none (type $2) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $none ;; Helper for the above. diff --git a/test/lit/passes/optimize-casts.wast b/test/lit/passes/optimize-casts.wast index acf8fc7b4..0719cbd91 100644 --- a/test/lit/passes/optimize-casts.wast +++ b/test/lit/passes/optimize-casts.wast @@ -1398,7 +1398,6 @@ ) ;; CHECK: (func $void (type $void) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $void ;; Helper for the above. diff --git a/test/lit/passes/optimize-instructions-call_ref-roundtrip.wast b/test/lit/passes/optimize-instructions-call_ref-roundtrip.wast index 05f03110c..c3e51d049 100644 --- a/test/lit/passes/optimize-instructions-call_ref-roundtrip.wast +++ b/test/lit/passes/optimize-instructions-call_ref-roundtrip.wast @@ -46,15 +46,12 @@ (ref.func $helper-3)) ;; CHECK: (func $helper-1 (type $v1) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $helper-1 (type $v1)) ;; CHECK: (func $helper-2 (type $v2) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $helper-2 (type $v2)) ;; CHECK: (func $helper-3 (type $v3) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $helper-3 (type $v3)) diff --git a/test/lit/passes/optimize-instructions-call_ref.wast b/test/lit/passes/optimize-instructions-call_ref.wast index 937fbe6a7..66e651a06 100644 --- a/test/lit/passes/optimize-instructions-call_ref.wast +++ b/test/lit/passes/optimize-instructions-call_ref.wast @@ -189,7 +189,6 @@ ;; Helper function for the above test. ;; CHECK: (func $return-nothing (type $none_=>_none) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $return-nothing) diff --git a/test/lit/passes/optimize-instructions-eh-legacy.wast b/test/lit/passes/optimize-instructions-eh-legacy.wast index a6c650183..dd51d6c17 100644 --- a/test/lit/passes/optimize-instructions-eh-legacy.wast +++ b/test/lit/passes/optimize-instructions-eh-legacy.wast @@ -6,7 +6,6 @@ ;; CHECK: (tag $e (param i32)) ;; CHECK: (func $dummy (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $dummy) (tag $e (param i32)) @@ -164,7 +163,6 @@ ;; CHECK-NEXT: (call $dummy) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch_all - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (i32.const 1) @@ -209,7 +207,6 @@ ;; CHECK-NEXT: (do ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch_all ;; CHECK-NEXT: (call $dummy) diff --git a/test/lit/passes/optimize-instructions-gc-iit.wast b/test/lit/passes/optimize-instructions-gc-iit.wast index ab3005af5..224e53d40 100644 --- a/test/lit/passes/optimize-instructions-gc-iit.wast +++ b/test/lit/passes/optimize-instructions-gc-iit.wast @@ -19,10 +19,8 @@ (type $other (struct (field i64) (field f32))) ;; CHECK: (func $foo (type $3) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; TNH: (func $foo (type $3) - ;; TNH-NEXT: (nop) ;; TNH-NEXT: ) (func $foo) diff --git a/test/lit/passes/optimize-instructions-gc.wast b/test/lit/passes/optimize-instructions-gc.wast index 21d6291a9..4b88507ff 100644 --- a/test/lit/passes/optimize-instructions-gc.wast +++ b/test/lit/passes/optimize-instructions-gc.wast @@ -472,7 +472,6 @@ ) ;; CHECK: (func $nothing (type $5) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $nothing) diff --git a/test/lit/passes/optimize-instructions-iit-eh-legacy.wast b/test/lit/passes/optimize-instructions-iit-eh-legacy.wast index c0e4a05da..79cb6f6f1 100644 --- a/test/lit/passes/optimize-instructions-iit-eh-legacy.wast +++ b/test/lit/passes/optimize-instructions-iit-eh-legacy.wast @@ -11,7 +11,6 @@ ;; CHECK: (func $ref-cast-statically-removed (type $2) ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $e ;; CHECK-NEXT: (throw $e diff --git a/test/lit/passes/optimize-instructions-mvp.wast b/test/lit/passes/optimize-instructions-mvp.wast index 8b1afa76a..f18c94c5c 100644 --- a/test/lit/passes/optimize-instructions-mvp.wast +++ b/test/lit/passes/optimize-instructions-mvp.wast @@ -15688,7 +15688,6 @@ ) ) ;; CHECK: (func $send-i32 (param $0 i32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $send-i32 (param i32)) ;; CHECK: (func $ternary-identical-arms-call (param $x i32) (param $y i32) (param $z i32) diff --git a/test/lit/passes/remove-unused-brs-eh.wast b/test/lit/passes/remove-unused-brs-eh.wast index 8ce578101..336b3b5a8 100644 --- a/test/lit/passes/remove-unused-brs-eh.wast +++ b/test/lit/passes/remove-unused-brs-eh.wast @@ -313,7 +313,6 @@ ;; CHECK-NEXT: (block $middle ;; CHECK-NEXT: (block $inner ;; CHECK-NEXT: (try_table (catch $e $outer) (catch $f $outer) (catch_all $outer) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) @@ -340,7 +339,6 @@ ;; CHECK-NEXT: (block $middle ;; CHECK-NEXT: (block $inner ;; CHECK-NEXT: (try_table (catch $e $outer) (catch $f $middle) (catch_all $outer) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (br $outer) diff --git a/test/lit/passes/remove-unused-brs.wast b/test/lit/passes/remove-unused-brs.wast index 6fcc5b066..3380db6b7 100644 --- a/test/lit/passes/remove-unused-brs.wast +++ b/test/lit/passes/remove-unused-brs.wast @@ -105,7 +105,6 @@ ) ;; CHECK: (func $nothing (type $1) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $nothing) diff --git a/test/lit/passes/remove-unused-brs_all-features.wast b/test/lit/passes/remove-unused-brs_all-features.wast index 98f020274..4e722a043 100644 --- a/test/lit/passes/remove-unused-brs_all-features.wast +++ b/test/lit/passes/remove-unused-brs_all-features.wast @@ -115,7 +115,6 @@ (unreachable) ) ;; CHECK: (func $i32_=>_none (type $2) (param $0 i32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $i32_=>_none (param i32) ) diff --git a/test/lit/passes/remove-unused-module-elements-refs.wast b/test/lit/passes/remove-unused-module-elements-refs.wast index 146a25ea6..bd4940037 100644 --- a/test/lit/passes/remove-unused-module-elements-refs.wast +++ b/test/lit/passes/remove-unused-module-elements-refs.wast @@ -113,10 +113,8 @@ ) ;; CHECK: (func $target-A (type $A) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $target-A (type $A) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $target-A (type $A) ;; This function is reachable from the export "foo": there is a RefFunc and @@ -129,10 +127,8 @@ ) ;; CHECK: (func $target-A-sub (type $A-sub) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $target-A-sub (type $A-sub) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $target-A-sub (type $A-sub) ;; This function is reachable because we have a CallRef of a supertype ($A). @@ -142,7 +138,6 @@ ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $target-A-super (type $A-super) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $target-A-super (type $A-super) ;; This function is not reachable. We have a CallRef of a subtype ($A), but @@ -153,7 +148,6 @@ ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $target-B (type $B) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $target-B (type $B) ;; This function is not reachable. We have a RefFunc in "foo" but no @@ -213,10 +207,8 @@ ) ;; CHECK: (func $target-A (type $A) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $target-A (type $A) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $target-A (type $A) ;; This function is reachable. @@ -290,20 +282,16 @@ ;; WORLD_OPEN-NEXT: ) ;; CHECK: (func $target-A-1 (type $A) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $target-A-1 (type $A) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $target-A-1 (type $A) ;; This function is reachable. ) ;; CHECK: (func $target-A-2 (type $A) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $target-A-2 (type $A) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $target-A-2 (type $A) ;; This function is reachable. @@ -377,20 +365,16 @@ ) ;; CHECK: (func $target-A-1 (type $A) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $target-A-1 (type $A) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $target-A-1 (type $A) ;; This function is reachable. ) ;; CHECK: (func $target-A-2 (type $A) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $target-A-2 (type $A) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $target-A-2 (type $A) ;; This function is reachable. @@ -524,10 +508,8 @@ ) ;; CHECK: (func $target-keep (type $A) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $target-keep (type $A) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $target-keep (type $A) ) @@ -536,7 +518,6 @@ ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $target-drop (type $A) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $target-drop (type $A) ;; In a closed world we can turn this body into unreachable. @@ -617,19 +598,15 @@ ) ;; CHECK: (func $target-keep (type $A) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $target-keep (type $A) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $target-keep (type $A) ) ;; CHECK: (func $target-keep-2 (type $A) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $target-keep-2 (type $A) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $target-keep-2 (type $A) ) @@ -974,10 +951,8 @@ ) ;; CHECK: (func $void (type $void) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $void (type $void) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $void (type $void) ;; Helper function. This is reached via a call_ref. @@ -987,7 +962,6 @@ ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $a (type $void) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $a (type $void) ;; This is unreachable (in closed world) since a reference to it only exists @@ -995,10 +969,8 @@ ) ;; CHECK: (func $b (type $void) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $b (type $void) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $b (type $void) ;; This is reachable. It is in field #1, which is read, and the global @@ -1009,7 +981,6 @@ ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $c (type $void) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $c (type $void) ;; Like $a, this is unreachable. That it is in a nested struct.new, and not @@ -1017,10 +988,8 @@ ) ;; CHECK: (func $d (type $void) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $d (type $void) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $d (type $void) ;; Like $b, this is reachable. That it is in a nested struct.new, and not @@ -1031,7 +1000,6 @@ ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $e (type $void) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $e (type $void) ;; Side effects on the struct field are not enough to make this reachable: @@ -1040,10 +1008,8 @@ ) ;; CHECK: (func $f (type $void) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $f (type $void) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $f (type $void) ;; Like $b, this is reachable (the tee does not matter). @@ -1053,7 +1019,6 @@ ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $g (type $void) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $g (type $void) ;; This is in a struct written to a field that is never read in $struct, so @@ -1064,7 +1029,6 @@ ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $h (type $void) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $h (type $void) ;; This is in a struct written to a field that is never read in $struct, so @@ -1141,10 +1105,8 @@ ) ;; CHECK: (func $void (type $void) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $void (type $void) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $void (type $void) ;; Helper function. This is reached via a call_ref. @@ -1154,7 +1116,6 @@ ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $a (type $void) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $a (type $void) ;; This is unreachable (in closed world) because we have no reads from the @@ -1162,10 +1123,8 @@ ) ;; CHECK: (func $b (type $void) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $b (type $void) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $b (type $void) ;; The local.tee makes this reachable: the value is not known to only reside @@ -1503,7 +1462,6 @@ ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $f (type $void) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $f (type $void) ;; This is unreachable in closed world. The global it is in has a reference @@ -1511,20 +1469,16 @@ ) ;; CHECK: (func $subf (type $void) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $subf (type $void) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $subf (type $void) ;; There is a read of $substruct's field, which makes this reachable. ) ;; CHECK: (func $subsubf (type $void) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $subsubf (type $void) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $subsubf (type $void) ;; There is a read of $substruct's field, which may read from any subtype, @@ -1607,10 +1561,8 @@ ) ;; CHECK: (func $f1 (type $void) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $f1 (type $void) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $f1 (type $void) ;; The global containing this function's reference is used. @@ -1620,7 +1572,6 @@ ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $f2 (type $void) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $f2 (type $void) ;; This is unreachable in closed world as the global is referred to from a @@ -1727,7 +1678,6 @@ ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $f (type $void) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $f (type $void) ;; This is unreachable in closed world since $B's field is not read, so the @@ -1851,10 +1801,8 @@ ) ;; CHECK: (func $f (type $void) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; OPEN_WORLD: (func $f (type $void) - ;; OPEN_WORLD-NEXT: (nop) ;; OPEN_WORLD-NEXT: ) (func $f (type $void) ) diff --git a/test/lit/passes/remove-unused-module-elements_all-features.wast b/test/lit/passes/remove-unused-module-elements_all-features.wast index 7c2ad11d8..8b4d7f186 100644 --- a/test/lit/passes/remove-unused-module-elements_all-features.wast +++ b/test/lit/passes/remove-unused-module-elements_all-features.wast @@ -186,7 +186,6 @@ ;; CHECK: (elem $1 (i32.const 0) $f) ;; CHECK: (func $f (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $f) ) @@ -227,7 +226,6 @@ ;; CHECK: (elem $0 (i32.const 0) $waka) ;; CHECK: (func $waka (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $waka) ) @@ -459,7 +457,6 @@ ;; CHECK: (elem $0 (global.get $tableBase) $waka) ;; CHECK: (func $waka (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $waka) ;; used in table ) @@ -819,7 +816,6 @@ ) ;; CHECK: (func $internal (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $internal ) diff --git a/test/lit/passes/remove-unused-module-elements_tnh.wast b/test/lit/passes/remove-unused-module-elements_tnh.wast index 22c09740d..537843191 100644 --- a/test/lit/passes/remove-unused-module-elements_tnh.wast +++ b/test/lit/passes/remove-unused-module-elements_tnh.wast @@ -162,12 +162,10 @@ (elem $bad (i32.const 10) $func) ;; CHECK: (func $func (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; T_N_H: (type $0 (func)) ;; T_N_H: (func $func (type $0) - ;; T_N_H-NEXT: (nop) ;; T_N_H-NEXT: ) (func $func) ) @@ -190,12 +188,10 @@ (elem $bad (i32.const 9) $func $func) ;; CHECK: (func $func (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; T_N_H: (type $0 (func)) ;; T_N_H: (func $func (type $0) - ;; T_N_H-NEXT: (nop) ;; T_N_H-NEXT: ) (func $func) ) @@ -211,12 +207,10 @@ ;; CHECK: (type $0 (func)) ;; CHECK: (func $func (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; T_N_H: (type $0 (func)) ;; T_N_H: (func $func (type $0) - ;; T_N_H-NEXT: (nop) ;; T_N_H-NEXT: ) (func $func) ) diff --git a/test/lit/passes/remove-unused-names-eh-legacy.wast b/test/lit/passes/remove-unused-names-eh-legacy.wast index 729e50add..797dabb55 100644 --- a/test/lit/passes/remove-unused-names-eh-legacy.wast +++ b/test/lit/passes/remove-unused-names-eh-legacy.wast @@ -8,7 +8,6 @@ ;; CHECK: (func $func0 (type $0) ;; CHECK-NEXT: (try $label$9 ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch_all ;; CHECK-NEXT: (try $label$8 diff --git a/test/lit/passes/rse-eh-legacy.wast b/test/lit/passes/rse-eh-legacy.wast index 7cdb2bccf..95a1459c3 100644 --- a/test/lit/passes/rse-eh-legacy.wast +++ b/test/lit/passes/rse-eh-legacy.wast @@ -11,7 +11,6 @@ ;; CHECK-NEXT: (local $x i32) ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch_all ;; CHECK-NEXT: (local.set $x @@ -47,7 +46,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch_all - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (local.set $x @@ -102,7 +100,6 @@ ) ;; CHECK: (func $foo (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo) @@ -116,7 +113,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch_all - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (local.set $x @@ -147,7 +143,6 @@ ;; CHECK-NEXT: (call $foo) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch_all - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (drop @@ -235,7 +230,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch_all - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (drop @@ -285,7 +279,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch_all - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (local.set $x @@ -498,7 +491,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch_all - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) @@ -560,7 +552,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch_all - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (local.set $x @@ -690,7 +681,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch_all - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (local.set $x @@ -754,7 +744,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch_all - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) @@ -762,7 +751,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch_all - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) diff --git a/test/lit/passes/rse-eh.wast b/test/lit/passes/rse-eh.wast index 100543ae9..8c26946b1 100644 --- a/test/lit/passes/rse-eh.wast +++ b/test/lit/passes/rse-eh.wast @@ -14,7 +14,6 @@ (tag $e-empty) ;; CHECK: (func $foo (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo) @@ -23,7 +22,6 @@ ;; CHECK-NEXT: (block $outer ;; CHECK-NEXT: (block $catch_all ;; CHECK-NEXT: (try_table (catch_all $catch_all) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (br $outer) ;; CHECK-NEXT: ) diff --git a/test/lit/passes/rse-gc.wast b/test/lit/passes/rse-gc.wast index 26a973da0..d00f6d3c4 100644 --- a/test/lit/passes/rse-gc.wast +++ b/test/lit/passes/rse-gc.wast @@ -13,7 +13,6 @@ ;; CHECK: (func $test (type $3) ;; CHECK-NEXT: (local $single (ref func)) ;; CHECK-NEXT: (local $tuple (tuple (ref any) (ref any))) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $test ;; A non-nullable local. The pass should ignore it (as we cannot optimize diff --git a/test/lit/passes/signature-pruning.wast b/test/lit/passes/signature-pruning.wast index b5c5b26e2..6a20d2815 100644 --- a/test/lit/passes/signature-pruning.wast +++ b/test/lit/passes/signature-pruning.wast @@ -308,7 +308,6 @@ ;; CHECK-NEXT: (local $1 f32) ;; CHECK-NEXT: (local $2 i64) ;; CHECK-NEXT: (local $3 i32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo (type $sig) (param $i32 i32) (param $i64 i64) (param $f32 f32) (param $f64 f64) ;; Use nothing at all: all params can be removed. @@ -394,7 +393,6 @@ ;; CHECK: (func $foo (type $sig) ;; CHECK-NEXT: (local $0 i32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo (type $sig) (param $i32 i32) ;; This function does not use the parameter. It also has no calls, but that @@ -416,7 +414,6 @@ ;; CHECK: (memory $0 1 1) ;; CHECK: (func $foo (type $sig) (param $i32 i32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo (type $sig) (param $i32 i32) ) @@ -431,7 +428,6 @@ ;; CHECK: (memory $0 1 1) ;; CHECK: (func $foo (type $sig) (param $i32 i32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo (type $sig) (param $i32 i32) ) @@ -469,7 +465,6 @@ ;; CHECK: (func $foo (type $sig) ;; CHECK-NEXT: (local $0 i32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo (type $sig) (param $i32 i32) ) @@ -505,14 +500,12 @@ ;; CHECK: (func $foo (type $sig) ;; CHECK-NEXT: (local $0 i32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo (type $sig) (param $i32 i32) ) ;; CHECK: (func $bar (type $sig) ;; CHECK-NEXT: (local $0 i32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $bar (type $sig) (param $i32 i32) ;; As above, but the second function also does not use the parameter, and @@ -574,7 +567,6 @@ ;; CHECK: (table $0 1 1 anyref) ;; CHECK: (func $foo (type $sig) (param $i32 i32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo (type $sig) (param $i32 i32) ) @@ -593,13 +585,11 @@ ;; CHECK: (export "bar" (func $bar)) ;; CHECK: (func $foo (type $sig) (param $i32 i32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo (export "foo") (type $sig) (param $i32 i32) ) ;; CHECK: (func $bar (type $sig) (param $i32 i32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $bar (export "bar") (type $sig) (param $i32 i32) ) @@ -632,14 +622,12 @@ ;; CHECK: (func $foo1 (type $sig1) ;; CHECK-NEXT: (local $0 i32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo1 (type $sig1) (param $i32 i32) ) ;; CHECK: (func $foo2 (type $sig2) ;; CHECK-NEXT: (local $0 f64) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo2 (type $sig2) (param $f64 f64) ) @@ -1174,13 +1162,11 @@ ;; CHECK: (export "exported" (func $exported)) ;; CHECK: (func $exported (type $none) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $exported (export "exported") (type $none) ) ;; CHECK: (func $unused-param (type $much) (param $param i32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $unused-param (type $much) (param $param i32) ) @@ -1219,14 +1205,12 @@ ;; CHECK: (export "exported" (func $exported)) ;; CHECK: (func $exported (type $none) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $exported (export "exported") (type $none) ;; This makes the rec group public. ) ;; CHECK: (func $unused-param (type $much) (param $param i32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $unused-param (type $much) (param $param i32) ) diff --git a/test/lit/passes/signature-refining.wast b/test/lit/passes/signature-refining.wast index f6f889408..b401237b8 100644 --- a/test/lit/passes/signature-refining.wast +++ b/test/lit/passes/signature-refining.wast @@ -17,7 +17,6 @@ (type $sig (sub (func (param anyref)))) ;; CHECK: (func $func (type $sig) (param $x (ref $struct)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $func (type $sig) (param $x anyref) ) @@ -49,7 +48,6 @@ ;; CHECK: (elem declare func $func) ;; CHECK: (func $func (type $sig) (param $x (ref $struct)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $func (type $sig) (param $x anyref) ) @@ -85,7 +83,6 @@ ;; CHECK: (elem declare func $func) ;; CHECK: (func $func (type $sig) (param $x eqref) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $func (type $sig) (param $x anyref) ) @@ -140,13 +137,11 @@ ) ;; CHECK: (func $func-1 (type $sig) (param $x (ref $struct)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $func-1 (type $sig) (param $x anyref) ) ;; CHECK: (func $func-2 (type $sig) (param $x (ref $struct)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $func-2 (type $sig) (param $x anyref) ) @@ -184,13 +179,11 @@ (type $struct (struct)) ;; CHECK: (func $func-1 (type $sig) (param $x (ref $struct)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $func-1 (type $sig) (param $x anyref) ) ;; CHECK: (func $func-2 (type $sig) (param $x (ref $struct)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $func-2 (type $sig) (param $x anyref) ) @@ -288,7 +281,6 @@ ;; CHECK: (elem declare func $func) ;; CHECK: (func $func (type $sig) (param $x (ref $struct)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $func (type $sig) (param $x anyref) ) @@ -327,7 +319,6 @@ ;; CHECK: (elem declare func $func) ;; CHECK: (func $func (type $sig) (param $x anyref) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $func (type $sig) (param $x anyref) ) @@ -356,7 +347,6 @@ (type $sig (sub (func (param anyref)))) ;; CHECK: (func $func (type $sig) (param $x anyref) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $func (type $sig) (param $x anyref) ) @@ -381,13 +371,11 @@ ;; CHECK: (elem declare func $func-2) ;; CHECK: (func $func-1 (type $sig-1) (param $x structref) (param $y anyref) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $func-1 (type $sig-1) (param $x anyref) (param $y anyref) ) ;; CHECK: (func $func-2 (type $sig-2) (param $x eqref) (param $y (ref $struct)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $func-2 (type $sig-2) (param $x anyref) (param $y anyref) ) @@ -455,7 +443,6 @@ ;; CHECK: (table $0 1 1 anyref) ;; CHECK: (func $func (type $sig) (param $x anyref) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $func (type $sig) (param $x anyref) ) @@ -487,7 +474,6 @@ (type $struct (struct)) ;; CHECK: (func $func (type $sig) (param $x (ref null $struct)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $func (type $sig) (param $x anyref) ) @@ -692,7 +678,6 @@ ;; CHECK: (export "prevent-opts" (func $func)) ;; CHECK: (func $func (type $sig) (param $x anyref) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $func (export "prevent-opts") (type $sig) (param $x anyref) ) @@ -1057,7 +1042,6 @@ ) ;; CHECK: (func $target (type $5) (param $x (ref $A)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $target (param $x (ref $A)) ;; Because of the two calls above, this cannot be refined. @@ -1109,7 +1093,6 @@ ) ;; CHECK: (func $target (type $1) (param $x (ref $B)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $target (param $x (ref $A)) ;; The two calls above both send $B, so we can refine the parameter to $B. @@ -1142,7 +1125,6 @@ (export "struct" (global $struct)) ;; CHECK: (func $func (type $sig) (param $x anyref) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $func (type $sig) (param $x anyref) ) diff --git a/test/lit/passes/simplify-locals-eh-legacy.wast b/test/lit/passes/simplify-locals-eh-legacy.wast index d7fb75776..f9ab2f8c1 100644 --- a/test/lit/passes/simplify-locals-eh-legacy.wast +++ b/test/lit/passes/simplify-locals-eh-legacy.wast @@ -5,14 +5,12 @@ ;; CHECK: (tag $e-i32 (param i32)) (tag $e-i32 (param i32)) ;; CHECK: (func $foo (type $3) (param $0 i32) (param $1 i32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo (param i32 i32)) ;; CHECK: (func $pop-cannot-be-sinked (type $0) ;; CHECK-NEXT: (local $0 i32) ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $e-i32 ;; CHECK-NEXT: (local.set $0 @@ -44,7 +42,6 @@ ;; CHECK-NEXT: (local $0 i32) ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch_all ;; CHECK-NEXT: (nop) diff --git a/test/lit/passes/simplify-locals-gc.wast b/test/lit/passes/simplify-locals-gc.wast index b3f6ac2fc..85ec16d99 100644 --- a/test/lit/passes/simplify-locals-gc.wast +++ b/test/lit/passes/simplify-locals-gc.wast @@ -262,7 +262,6 @@ ) ;; CHECK: (func $helper (type $8) (param $ref (ref func)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $helper (param $ref (ref func)) ) @@ -491,14 +490,12 @@ ) ;; CHECK: (func $use-nn-any (type $15) (param $nn-any (ref any)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $use-nn-any (param $nn-any (ref any)) ;; Helper function for the above. ) ;; CHECK: (func $use-any (type $7) (param $any anyref) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $use-any (param $any anyref) ;; Helper function for the above. diff --git a/test/lit/passes/simplify-locals-global.wast b/test/lit/passes/simplify-locals-global.wast index 215b32a3c..a471225d9 100644 --- a/test/lit/passes/simplify-locals-global.wast +++ b/test/lit/passes/simplify-locals-global.wast @@ -45,7 +45,6 @@ ) ;; CHECK: (func $helper - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $helper) ) diff --git a/test/lit/passes/ssa.wast b/test/lit/passes/ssa.wast index 68b853607..b082cd888 100644 --- a/test/lit/passes/ssa.wast +++ b/test/lit/passes/ssa.wast @@ -6,7 +6,6 @@ (type $A (struct )) ;; CHECK: (func $foo (type $1) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo) diff --git a/test/lit/passes/stack-ir-roundtrip-eh-legacy.wast b/test/lit/passes/stack-ir-roundtrip-eh-legacy.wast index cedcdbf45..439681a8f 100644 --- a/test/lit/passes/stack-ir-roundtrip-eh-legacy.wast +++ b/test/lit/passes/stack-ir-roundtrip-eh-legacy.wast @@ -9,7 +9,6 @@ ;; CHECK-NEXT: (do ;; CHECK-NEXT: (try $label$7 ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $tag ;; CHECK-NEXT: (drop @@ -17,7 +16,6 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (try $label$6 ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (delegate 2) ;; CHECK-NEXT: ) diff --git a/test/lit/passes/string-lowering_types.wast b/test/lit/passes/string-lowering_types.wast index cab84a1b8..2274fcaf9 100644 --- a/test/lit/passes/string-lowering_types.wast +++ b/test/lit/passes/string-lowering_types.wast @@ -65,7 +65,6 @@ ;; CHECK: (func $export (type $4) ;; CHECK-NEXT: (local $0 (ref $private)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $export (export "export") ;; Keep the private type alive. diff --git a/test/lit/passes/translate-to-exnref.wast b/test/lit/passes/translate-to-exnref.wast index 8bac0dc39..388bcf8bd 100644 --- a/test/lit/passes/translate-to-exnref.wast +++ b/test/lit/passes/translate-to-exnref.wast @@ -43,19 +43,16 @@ (tag $e-i32-i64 (param i32 i64)) ;; CHECK: (func $foo (type $1) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; STACKIR-OPT: (func $foo (type $1) ;; STACKIR-OPT-NEXT: ) (func $foo) ;; CHECK: (func $bar (type $1) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; STACKIR-OPT: (func $bar (type $1) ;; STACKIR-OPT-NEXT: ) (func $bar) ;; CHECK: (func $baz (type $1) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; STACKIR-OPT: (func $baz (type $1) ;; STACKIR-OPT-NEXT: ) @@ -1621,7 +1618,8 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; CHECK-NEXT: (nop) + ;; CHECK-NEXT: (block + ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; STACKIR-OPT: (func $delegate-target-outer-try-none (type $1) @@ -1678,7 +1676,8 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; CHECK-NEXT: (nop) + ;; CHECK-NEXT: (block + ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; STACKIR-OPT: (func $multiple-delegates-target-outer-try-none (type $1) @@ -1963,14 +1962,16 @@ ;; CHECK-NEXT: ) ;; CHECK-NEXT: (br $outer1) ;; CHECK-NEXT: ) - ;; CHECK-NEXT: (nop) + ;; CHECK-NEXT: (block + ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (br $outer3) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) - ;; CHECK-NEXT: (nop) + ;; CHECK-NEXT: (block + ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; STACKIR-OPT: (func $delegate-nested-more (type $1) diff --git a/test/lit/passes/type-finalizing.wast b/test/lit/passes/type-finalizing.wast index 6897c6abf..f1511246b 100644 --- a/test/lit/passes/type-finalizing.wast +++ b/test/lit/passes/type-finalizing.wast @@ -78,7 +78,6 @@ ;; UNFINAL-NEXT: (local $parent (ref $parent)) ;; UNFINAL-NEXT: (local $child-final (ref $child-final)) ;; UNFINAL-NEXT: (local $child-open (ref $child-open)) - ;; UNFINAL-NEXT: (nop) ;; UNFINAL-NEXT: ) ;; DOFINAL: (type $3 (func)) @@ -86,7 +85,6 @@ ;; DOFINAL-NEXT: (local $parent (ref $parent)) ;; DOFINAL-NEXT: (local $child-final (ref $child-final)) ;; DOFINAL-NEXT: (local $child-open (ref $child-open)) - ;; DOFINAL-NEXT: (nop) ;; DOFINAL-NEXT: ) (func $keepalive (local $parent (ref $parent)) diff --git a/test/lit/passes/type-generalizing.wast b/test/lit/passes/type-generalizing.wast index 00a809648..66e352005 100644 --- a/test/lit/passes/type-generalizing.wast +++ b/test/lit/passes/type-generalizing.wast @@ -54,7 +54,6 @@ ;; CHECK-NEXT: (local $x i32) ;; CHECK-NEXT: (local $y anyref) ;; CHECK-NEXT: (local $z (tuple anyref i32)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $unconstrained ;; This non-ref local should be unmodified diff --git a/test/lit/passes/type-merging-shared.wast b/test/lit/passes/type-merging-shared.wast index fb7fa89b7..99b030f01 100644 --- a/test/lit/passes/type-merging-shared.wast +++ b/test/lit/passes/type-merging-shared.wast @@ -28,7 +28,6 @@ ;; CHECK-NEXT: (local $b' (ref null $B')) ;; CHECK-NEXT: (local $c (ref null $C)) ;; CHECK-NEXT: (local $c' (ref null $C')) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo (local $a (ref null $A)) @@ -64,7 +63,6 @@ ;; CHECK-NEXT: (local $b' (ref null $B)) ;; CHECK-NEXT: (local $c (ref null $C)) ;; CHECK-NEXT: (local $c' (ref null $C)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo (local $a (ref null $A)) @@ -90,7 +88,6 @@ ;; CHECK: (func $foo (type $2) ;; CHECK-NEXT: (local $a (ref null $A)) ;; CHECK-NEXT: (local $a' (ref null $A')) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo (local $a (ref null $A)) diff --git a/test/lit/passes/type-merging.wast b/test/lit/passes/type-merging.wast index 5d0c4bc5e..942e15b02 100644 --- a/test/lit/passes/type-merging.wast +++ b/test/lit/passes/type-merging.wast @@ -95,7 +95,6 @@ ;; CHECK-NEXT: (local $e (ref null $D)) ;; CHECK-NEXT: (local $f (ref null $D)) ;; CHECK-NEXT: (local $g (ref null $D)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo (local $a (ref null $A)) @@ -139,7 +138,6 @@ ;; CHECK-NEXT: (local $e (ref null $D)) ;; CHECK-NEXT: (local $f (ref null $D)) ;; CHECK-NEXT: (local $g (ref null $D)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo (local $a (ref null $A)) @@ -169,7 +167,6 @@ ;; CHECK-NEXT: (local $a (ref null $A)) ;; CHECK-NEXT: (local $b (ref null $A)) ;; CHECK-NEXT: (local $c (ref null $C)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo ;; B can be merged into A even though it refines A's field because that @@ -192,7 +189,6 @@ ;; CHECK: (func $foo (type $1) ;; CHECK-NEXT: (local $a (ref null $A)) ;; CHECK-NEXT: (local $b (ref null $A)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo ;; A recursive subtype can be merged even though its field is a refinement @@ -220,7 +216,6 @@ ;; CHECK-NEXT: (local $b (ref null $A)) ;; CHECK-NEXT: (local $x (ref null $X)) ;; CHECK-NEXT: (local $y (ref null $X)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo ;; Two mutually referential chains, A->B and X->Y, can be merged into a pair @@ -249,7 +244,6 @@ ;; CHECK-NEXT: (local $b (ref null $X)) ;; CHECK-NEXT: (local $x (ref null $X)) ;; CHECK-NEXT: (local $y (ref null $X)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo ;; As above, but now the A->B and X->Y chains are not differentiated by the @@ -278,7 +272,6 @@ ;; CHECK-NEXT: (local $b (ref null $A)) ;; CHECK-NEXT: (local $x (ref null $X)) ;; CHECK-NEXT: (local $y (ref null $X)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo ;; As above with the differentiated chains, but now the types are top-level @@ -306,7 +299,6 @@ ;; CHECK-NEXT: (local $b (ref null $X)) ;; CHECK-NEXT: (local $x (ref null $X)) ;; CHECK-NEXT: (local $y (ref null $X)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo ;; As above, but with all the types merging into a single type. @@ -429,7 +421,6 @@ ;; CHECK-NEXT: (local $l' (ref null $L)) ;; CHECK-NEXT: (local $m (ref null $M)) ;; CHECK-NEXT: (local $m' (ref null $M)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo (local $a (ref null $A)) @@ -479,7 +470,6 @@ ;; CHECK-NEXT: (local $a (ref null $A)) ;; CHECK-NEXT: (local $b (ref null $B)) ;; CHECK-NEXT: (local $c (ref null $B)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo ;; B and C cannot be merged into A because they refine A's field, but B and @@ -506,7 +496,6 @@ ;; CHECK-NEXT: (local $a (ref null $A)) ;; CHECK-NEXT: (local $b (ref null $B)) ;; CHECK-NEXT: (local $c (ref null $B)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo ;; This is the same as above, but now B and C refine A such that they have a @@ -537,7 +526,6 @@ ;; CHECK-NEXT: (local $c (ref null $A)) ;; CHECK-NEXT: (local $d (ref null $D)) ;; CHECK-NEXT: (local $e (ref null $D)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo ;; D and E should be mergeable because they have identical shapes and will @@ -587,7 +575,6 @@ ;; CHECK-NEXT: (local $c' (ref null $C)) ;; CHECK-NEXT: (local $d (ref null $D)) ;; CHECK-NEXT: (local $d' (ref null $D)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo (local $a (ref null $A)) @@ -696,7 +683,6 @@ ;; CHECK: (func $foo (type $3) ;; CHECK-NEXT: (local $a (ref null $intarray)) ;; CHECK-NEXT: (local $b (ref null $intarray)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo ;; $A will remain the same. @@ -709,7 +695,6 @@ ;; CHECK-NEXT: (local $a (ref null $refarray)) ;; CHECK-NEXT: (local $b (ref null $refarray)) ;; CHECK-NEXT: (local $c (ref null $sub-refarray-nn)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $bar (local $a (ref null $refarray)) @@ -735,7 +720,6 @@ ;; CHECK-NEXT: (local $a (ref null $func)) ;; CHECK-NEXT: (local $b (ref null $func)) ;; CHECK-NEXT: (local $c (ref null $sub-func-refined)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo ;; $func will remain the same. @@ -830,7 +814,6 @@ ;; CHECK: (func $foo (type $3) ;; CHECK-NEXT: (local $b (ref null $A')) ;; CHECK-NEXT: (local $x (ref null $X)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo (local $b (ref null $A')) diff --git a/test/lit/passes/type-refining.wast b/test/lit/passes/type-refining.wast index 8e8ccf24c..d045dbc1a 100644 --- a/test/lit/passes/type-refining.wast +++ b/test/lit/passes/type-refining.wast @@ -168,7 +168,6 @@ ;; CHECK: (func $keepalive (type $4) ;; CHECK-NEXT: (local $temp (ref null $child-B)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $keepalive ;; Add a reference to $child-B just to keep it alive in the output for easier diff --git a/test/lit/string.as_wtf16.wast b/test/lit/string.as_wtf16.wast index 916e11d39..60bdcf5ec 100644 --- a/test/lit/string.as_wtf16.wast +++ b/test/lit/string.as_wtf16.wast @@ -9,7 +9,6 @@ (module ;; CHECK: (func $empty (type $2) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; RTRIP: (func $empty (type $2) ;; RTRIP-NEXT: ) diff --git a/test/lit/validation/nn-tuples.wast b/test/lit/validation/nn-tuples.wast index a673ec900..c3c5e4e4f 100644 --- a/test/lit/validation/nn-tuples.wast +++ b/test/lit/validation/nn-tuples.wast @@ -8,7 +8,6 @@ (module ;; CHECK: (func $foo (type $0) ;; CHECK-NEXT: (local $tuple (tuple (ref any) (ref any))) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $foo (local $tuple (tuple (ref any) (ref any))) diff --git a/test/lit/wasm-split/passive.wast b/test/lit/wasm-split/passive.wast index 743d7d14e..d335d79a8 100644 --- a/test/lit/wasm-split/passive.wast +++ b/test/lit/wasm-split/passive.wast @@ -26,7 +26,6 @@ ;; PRIMARY: (export "table_1" (table $1)) ;; PRIMARY: (func $in-table (type $0) - ;; PRIMARY-NEXT: (nop) ;; PRIMARY-NEXT: ) (func $in-table ;; This is in a passive segment, but it is in the main module so we need no @@ -40,7 +39,6 @@ ;; SECONDARY: (elem $0 (i32.const 0) $second-in-table) ;; SECONDARY: (func $second-in-table (type $0) - ;; SECONDARY-NEXT: (nop) ;; SECONDARY-NEXT: ) (func $second-in-table ;; This is in a passive segment, and it is in the secondary module, so we will diff --git a/test/lit/wasm-split/ref.func.wast b/test/lit/wasm-split/ref.func.wast index d9a30890a..f97f790ff 100644 --- a/test/lit/wasm-split/ref.func.wast +++ b/test/lit/wasm-split/ref.func.wast @@ -89,7 +89,6 @@ ) ;; PRIMARY: (func $in-table (type $0) - ;; PRIMARY-NEXT: (nop) ;; PRIMARY-NEXT: ) (func $in-table ;; This empty function is in the table. Just being present in the table is not @@ -98,7 +97,6 @@ ) ;; SECONDARY: (func $second-in-table (type $0) - ;; SECONDARY-NEXT: (nop) ;; SECONDARY-NEXT: ) (func $second-in-table ;; As above, but in the secondary module. We still don't need a trampoline diff --git a/test/lit/wat-kitchen-sink.wast b/test/lit/wat-kitchen-sink.wast index 3936354a1..97d9f57e8 100644 --- a/test/lit/wat-kitchen-sink.wast +++ b/test/lit/wat-kitchen-sink.wast @@ -475,15 +475,12 @@ (func) ;; CHECK: (func $2 (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK: (func $f1 (type $18) (param $0 i32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $f1 (param i32)) ;; CHECK: (func $f2 (type $18) (param $x i32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $f2 (param $x i32)) ;; CHECK: (func $f3 (type $1) (result i32) @@ -496,12 +493,10 @@ ;; CHECK-NEXT: (local $0 i32) ;; CHECK-NEXT: (local $1 i64) ;; CHECK-NEXT: (local $l f32) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $f4 (type 18) (local i32 i64) (local $l f32)) ;; CHECK: (func $"[quoted_name]" (type $0) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $"[quoted_name]") @@ -1138,10 +1133,8 @@ ;; CHECK-NEXT: (if ;; CHECK-NEXT: (i32.const 0) ;; CHECK-NEXT: (then - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (else - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) @@ -1336,10 +1329,8 @@ ;; CHECK-NEXT: (if ;; CHECK-NEXT: (i32.const 0) ;; CHECK-NEXT: (then - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (else - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) @@ -1507,10 +1498,8 @@ ;; CHECK-NEXT: (if ;; CHECK-NEXT: (i32.const 0) ;; CHECK-NEXT: (then -;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (else -;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (if @@ -1518,10 +1507,8 @@ ;; CHECK-NEXT: (i32.const 0) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (then -;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (else -;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) @@ -1659,7 +1646,6 @@ ;; CHECK: (func $loop-empty (type $0) ;; CHECK-NEXT: (loop - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) (func $loop-empty @@ -1755,7 +1741,6 @@ ;; CHECK: (func $loop-folded-empty (type $0) ;; CHECK-NEXT: (loop - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) (func $loop-folded-empty @@ -1839,10 +1824,8 @@ ;; CHECK: (func $try-catch (type $0) ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $empty - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) @@ -1898,10 +1881,8 @@ ;; CHECK: (func $try-catch_all (type $0) ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch_all - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) @@ -1914,16 +1895,12 @@ ;; CHECK: (func $try-catch-catch_all (type $0) ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $empty - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $eimport$0 - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch_all - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) ;; CHECK-NEXT: ) @@ -1938,7 +1915,6 @@ ;; CHECK: (func $try-delegate (type $0) ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (delegate 0) ;; CHECK-NEXT: ) @@ -1952,7 +1928,6 @@ ;; CHECK-NEXT: (block $l ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (delegate 1) ;; CHECK-NEXT: ) @@ -1969,7 +1944,6 @@ ;; CHECK-NEXT: (block $l ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (delegate 1) ;; CHECK-NEXT: ) @@ -1986,7 +1960,6 @@ ;; CHECK-NEXT: (block $l ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (delegate 1) ;; CHECK-NEXT: ) @@ -2004,7 +1977,6 @@ ;; CHECK-NEXT: (do ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (delegate $label) ;; CHECK-NEXT: ) @@ -2025,7 +1997,6 @@ ;; CHECK-NEXT: (do ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (delegate $l) ;; CHECK-NEXT: ) @@ -2046,7 +2017,6 @@ ;; CHECK-NEXT: (do ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (delegate $label) ;; CHECK-NEXT: ) @@ -2068,7 +2038,6 @@ ;; CHECK-NEXT: (block $l ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (delegate $label) ;; CHECK-NEXT: ) @@ -2091,7 +2060,6 @@ ;; CHECK-NEXT: (block $l0 ;; CHECK-NEXT: (try $l1 ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (delegate $l) ;; CHECK-NEXT: ) @@ -2113,12 +2081,10 @@ ;; CHECK-NEXT: (do ;; CHECK-NEXT: (try $l0 ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $empty ;; CHECK-NEXT: (try $l1 ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (delegate $l) ;; CHECK-NEXT: ) @@ -2143,12 +2109,10 @@ ;; CHECK-NEXT: (do ;; CHECK-NEXT: (try $l0 ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch_all ;; CHECK-NEXT: (try $l1 ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (delegate $l) ;; CHECK-NEXT: ) @@ -2262,7 +2226,6 @@ ;; CHECK: (func $try-delegate-folded (type $0) ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (delegate 0) ;; CHECK-NEXT: ) @@ -2277,7 +2240,6 @@ ;; CHECK: (func $rethrow (type $0) ;; CHECK-NEXT: (try $label ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $empty ;; CHECK-NEXT: (rethrow $label) @@ -2294,7 +2256,6 @@ ;; CHECK: (func $rethrow-named (type $0) ;; CHECK-NEXT: (try $l ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $empty ;; CHECK-NEXT: (rethrow $l) @@ -2311,12 +2272,10 @@ ;; CHECK: (func $rethrow-nested (type $0) ;; CHECK-NEXT: (try $label ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $empty ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $empty ;; CHECK-NEXT: (rethrow $label) @@ -2340,12 +2299,10 @@ ;; CHECK: (func $rethrow-nested-named (type $0) ;; CHECK-NEXT: (try $l ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $empty ;; CHECK-NEXT: (try ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $empty ;; CHECK-NEXT: (rethrow $l) @@ -2369,7 +2326,6 @@ ;; CHECK: (func $rethrow-try-nested (type $0) ;; CHECK-NEXT: (try $label ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $empty ;; CHECK-NEXT: (try @@ -2396,7 +2352,6 @@ ;; CHECK: (func $rethrow-try-nested-named (type $0) ;; CHECK-NEXT: (try $l ;; CHECK-NEXT: (do - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) ;; CHECK-NEXT: (catch $empty ;; CHECK-NEXT: (try @@ -5035,7 +4990,6 @@ ) ;; CHECK: (func $use-types (type $96) (param $0 (ref $s0)) (param $1 (ref $s1)) (param $2 (ref $s2)) (param $3 (ref $s3)) (param $4 (ref $s4)) (param $5 (ref $s5)) (param $6 (ref $s6)) (param $7 (ref $s7)) (param $8 (ref $s8)) (param $9 (ref $a0)) (param $10 (ref $a1)) (param $11 (ref $a2)) (param $12 (ref $a3)) (param $13 (ref $subvoid)) (param $14 (ref $submany)) (param $15 (ref $all-types)) - ;; CHECK-NEXT: (nop) ;; CHECK-NEXT: ) (func $use-types (param (ref $s0)) diff --git a/test/lld/basic_safe_stack.wat.out b/test/lld/basic_safe_stack.wat.out index 7d554cc88..b92a3048c 100644 --- a/test/lld/basic_safe_stack.wat.out +++ b/test/lld/basic_safe_stack.wat.out @@ -15,7 +15,6 @@ (export "main" (func $main)) (export "__set_stack_limits" (func $__set_stack_limits)) (func $__wasm_call_ctors - (nop) ) (func $stackRestore (param $0 i32) (local $1 i32) @@ -81,7 +80,6 @@ (local.get $1) ) (func $main - (nop) ) (func $__set_stack_limits (param $0 i32) (param $1 i32) (global.set $__stack_base diff --git a/test/lld/duplicate_imports.wat.out b/test/lld/duplicate_imports.wat.out index 7e49b393c..e2d822f0d 100644 --- a/test/lld/duplicate_imports.wat.out +++ b/test/lld/duplicate_imports.wat.out @@ -34,7 +34,6 @@ (i32.const 0) ) (func $__wasm_call_ctors - (nop) ) (func $dynCall_ffd (param $fptr i32) (param $0 f32) (param $1 f64) (result f32) (call_indirect (type $8) diff --git a/test/lld/em_asm.wat.out b/test/lld/em_asm.wat.out index 8ed3d72ba..3165aa75a 100644 --- a/test/lld/em_asm.wat.out +++ b/test/lld/em_asm.wat.out @@ -17,7 +17,6 @@ (export "__start_em_asm" (global $global$1)) (export "__stop_em_asm" (global $global$2)) (func $__wasm_call_ctors - (nop) ) (func $__original_main (result i32) (local $0 i32) diff --git a/test/lld/em_asm64.wat.out b/test/lld/em_asm64.wat.out index 33e5bb176..297933163 100644 --- a/test/lld/em_asm64.wat.out +++ b/test/lld/em_asm64.wat.out @@ -17,7 +17,6 @@ (export "__start_em_asm" (global $global$1)) (export "__stop_em_asm" (global $global$2)) (func $__wasm_call_ctors - (nop) ) (func $__original_main (result i32) (local $0 i64) diff --git a/test/lld/em_asm_O0.wat.out b/test/lld/em_asm_O0.wat.out index fb2495476..6635354bf 100644 --- a/test/lld/em_asm_O0.wat.out +++ b/test/lld/em_asm_O0.wat.out @@ -16,7 +16,6 @@ (export "__start_em_asm" (global $global$1)) (export "__stop_em_asm" (global $global$2)) (func $__wasm_call_ctors - (nop) ) (func $__original_main (result i32) (local $0 i32) diff --git a/test/lld/em_asm_main_thread.wat.out b/test/lld/em_asm_main_thread.wat.out index 5d817ca86..8ee66c622 100644 --- a/test/lld/em_asm_main_thread.wat.out +++ b/test/lld/em_asm_main_thread.wat.out @@ -23,7 +23,6 @@ (export "__data_end" (global $global$2)) (export "main" (func $main)) (func $__wasm_call_ctors - (nop) ) (func $__original_main (result i32) (local $0 i32) diff --git a/test/lld/em_asm_shared.wat.out b/test/lld/em_asm_shared.wat.out index 0962d3504..5b72ac8ab 100644 --- a/test/lld/em_asm_shared.wat.out +++ b/test/lld/em_asm_shared.wat.out @@ -28,10 +28,8 @@ (export "__start_em_asm" (global $global$3)) (export "__stop_em_asm" (global $global$4)) (func $__wasm_call_ctors - (nop) ) (func $__wasm_apply_data_relocs - (nop) ) (func $__original_main (result i32) (local $0 i32) diff --git a/test/lld/hello_world.wat.out b/test/lld/hello_world.wat.out index 8081048d8..0e105c4c0 100644 --- a/test/lld/hello_world.wat.out +++ b/test/lld/hello_world.wat.out @@ -12,7 +12,6 @@ (export "__wasm_call_ctors" (func $__wasm_call_ctors)) (export "main" (func $main)) (func $__wasm_call_ctors - (nop) ) (func $__original_main (result i32) (drop diff --git a/test/lld/longjmp.wat.out b/test/lld/longjmp.wat.out index a9a5ac763..508ded293 100644 --- a/test/lld/longjmp.wat.out +++ b/test/lld/longjmp.wat.out @@ -25,7 +25,6 @@ (export "main" (func $main)) (export "dynCall_vii" (func $dynCall_vii)) (func $__wasm_call_ctors - (nop) ) (func $__original_main (result i32) (local $0 i32) diff --git a/test/lld/main_module_table.wat.out b/test/lld/main_module_table.wat.out index 05675c911..b926e05e0 100644 --- a/test/lld/main_module_table.wat.out +++ b/test/lld/main_module_table.wat.out @@ -6,6 +6,5 @@ (export "__stdio_write" (func $__stdio_write)) (export "__data_end" (global $global)) (func $__stdio_write - (nop) ) ) diff --git a/test/lld/main_module_table_2.wat.out b/test/lld/main_module_table_2.wat.out index de7e5542a..819ca3216 100644 --- a/test/lld/main_module_table_2.wat.out +++ b/test/lld/main_module_table_2.wat.out @@ -7,6 +7,5 @@ (export "__stdio_write" (func $__stdio_write)) (export "__data_end" (global $global)) (func $__stdio_write - (nop) ) ) diff --git a/test/lld/main_module_table_3.wat.out b/test/lld/main_module_table_3.wat.out index 0bd9dcd2a..06201f383 100644 --- a/test/lld/main_module_table_3.wat.out +++ b/test/lld/main_module_table_3.wat.out @@ -8,6 +8,5 @@ (export "__stdio_write" (func $__stdio_write)) (export "__data_end" (global $global)) (func $__stdio_write - (nop) ) ) diff --git a/test/lld/main_module_table_4.wat.out b/test/lld/main_module_table_4.wat.out index d144e688e..966ac588d 100644 --- a/test/lld/main_module_table_4.wat.out +++ b/test/lld/main_module_table_4.wat.out @@ -9,6 +9,5 @@ (export "__stdio_write" (func $__stdio_write)) (export "__data_end" (global $global)) (func $__stdio_write - (nop) ) ) diff --git a/test/lld/main_module_table_5.wat.out b/test/lld/main_module_table_5.wat.out index 04167c9b3..38e4be98b 100644 --- a/test/lld/main_module_table_5.wat.out +++ b/test/lld/main_module_table_5.wat.out @@ -11,13 +11,10 @@ (export "__data_end" (global $global)) (export "dynCall_v" (func $dynCall_v)) (func $__stdio_write - (nop) ) (func $other - (nop) ) (func $stuff - (nop) ) (func $dynCall_v (param $fptr i32) (call_indirect (type $0) diff --git a/test/lld/recursive.wat.out b/test/lld/recursive.wat.out index ae7945a2a..47035fe7a 100644 --- a/test/lld/recursive.wat.out +++ b/test/lld/recursive.wat.out @@ -11,7 +11,6 @@ (export "__wasm_call_ctors" (func $__wasm_call_ctors)) (export "main" (func $main)) (func $__wasm_call_ctors - (nop) ) (func $foo (param $0 i32) (param $1 i32) (result i32) (local $2 i32) diff --git a/test/lld/recursive_safe_stack.wat.out b/test/lld/recursive_safe_stack.wat.out index ad30dc776..f042d8e15 100644 --- a/test/lld/recursive_safe_stack.wat.out +++ b/test/lld/recursive_safe_stack.wat.out @@ -21,7 +21,6 @@ (export "main" (func $main)) (export "__set_stack_limits" (func $__set_stack_limits)) (func $__wasm_call_ctors - (nop) ) (func $foo (param $0 i32) (param $1 i32) (result i32) (local $2 i32) diff --git a/test/lld/reserved_func_ptr.wat.out b/test/lld/reserved_func_ptr.wat.out index 5239ce510..554d6aa06 100644 --- a/test/lld/reserved_func_ptr.wat.out +++ b/test/lld/reserved_func_ptr.wat.out @@ -17,13 +17,10 @@ (export "__main_argc_argv" (func $main)) (export "dynCall_viii" (func $dynCall_viii)) (func $__wasm_call_ctors - (nop) ) (func $address_taken_func\28int\2c\20int\2c\20int\29 (param $0 i32) (param $1 i32) (param $2 i32) - (nop) ) (func $address_taken_func2\28int\2c\20int\2c\20int\29 (param $0 i32) (param $1 i32) (param $2 i32) - (nop) ) (func $main (param $0 i32) (param $1 i32) (result i32) (local $2 i32) diff --git a/test/lld/safe_stack_standalone-wasm.wat.out b/test/lld/safe_stack_standalone-wasm.wat.out index 63d6c09d4..2820566b3 100644 --- a/test/lld/safe_stack_standalone-wasm.wat.out +++ b/test/lld/safe_stack_standalone-wasm.wat.out @@ -19,7 +19,6 @@ (export "main" (func $main)) (export "__set_stack_limits" (func $__set_stack_limits)) (func $__wasm_call_ctors - (nop) ) (func $foo (param $0 i32) (param $1 i32) (result i32) (local $2 i32) diff --git a/test/lld/shared.wat.out b/test/lld/shared.wat.out index 1a496e436..6ce5b208e 100644 --- a/test/lld/shared.wat.out +++ b/test/lld/shared.wat.out @@ -19,7 +19,6 @@ (export "ptr_puts" (global $global$0)) (export "ptr_local_func" (global $global$1)) (func $__wasm_call_ctors - (nop) ) (func $__wasm_apply_data_relocs (i32.store diff --git a/test/lld/shared_longjmp.wat.out b/test/lld/shared_longjmp.wat.out index 449714270..96ef571f7 100644 --- a/test/lld/shared_longjmp.wat.out +++ b/test/lld/shared_longjmp.wat.out @@ -32,10 +32,8 @@ (export "__threwValue" (global $global$1)) (export "dynCall_vii" (func $dynCall_vii)) (func $__wasm_call_ctors - (nop) ) (func $__wasm_apply_data_relocs - (nop) ) (func $_start (local $0 i32) diff --git a/test/metadce/name_collision.wast.dced b/test/metadce/name_collision.wast.dced index 50e7010dc..6be2d6ecf 100644 --- a/test/metadce/name_collision.wast.dced +++ b/test/metadce/name_collision.wast.dced @@ -2,6 +2,5 @@ (type $0 (func)) (export "test" (func $test)) (func $test (type $0) - (nop) ) ) diff --git a/test/metadce/outside.wast.dced b/test/metadce/outside.wast.dced index 6cc8b71d6..f5dc4e1e0 100644 --- a/test/metadce/outside.wast.dced +++ b/test/metadce/outside.wast.dced @@ -11,7 +11,6 @@ (elem $0 (global.get $from_segment_2) $table_func) (export "wasm_func" (func $a_wasm_func)) (func $table_func (type $0) - (nop) ) (func $a_wasm_func (type $0) (call $a_js_func) diff --git a/test/metadce/tag.wast.dced b/test/metadce/tag.wast.dced index 6f07a4e75..f2d5cf625 100644 --- a/test/metadce/tag.wast.dced +++ b/test/metadce/tag.wast.dced @@ -9,7 +9,6 @@ (throw $t0) ) (catch $t1 - (nop) ) ) ) diff --git a/test/passes/duplicate-function-elimination_all-features.txt b/test/passes/duplicate-function-elimination_all-features.txt index 6867002bf..d46f4ed41 100644 --- a/test/passes/duplicate-function-elimination_all-features.txt +++ b/test/passes/duplicate-function-elimination_all-features.txt @@ -16,7 +16,6 @@ (export "memory" (memory $foo)) (export "global" (global $bar)) (func $bar (type $0) - (nop) ) ) (module diff --git a/test/passes/func-metrics.txt b/test/passes/func-metrics.txt index b61e8146e..86eb8871f 100644 --- a/test/passes/func-metrics.txt +++ b/test/passes/func-metrics.txt @@ -13,10 +13,10 @@ global Const : 3 RefFunc : 3 func: empty - [binary-bytes] : 3 + [binary-bytes] : 2 [total] : 1 [vars] : 0 - Nop : 1 + Block : 1 func: small [binary-bytes] : 9 [total] : 5 @@ -44,7 +44,6 @@ func: ifs (table $0 256 256 funcref) (elem $0 (i32.const 0) $ifs $ifs $ifs) (func $empty - (nop) ) (func $small (nop) diff --git a/test/passes/licm.txt b/test/passes/licm.txt index 83edd78c3..64d86c32e 100644 --- a/test/passes/licm.txt +++ b/test/passes/licm.txt @@ -508,7 +508,6 @@ ) (func $after (loop $loop - (nop) ) (drop (i32.const 10) diff --git a/test/passes/minify-imports-and-exports_all-features.txt b/test/passes/minify-imports-and-exports_all-features.txt index 2d131416d..87aa3c2f2 100644 --- a/test/passes/minify-imports-and-exports_all-features.txt +++ b/test/passes/minify-imports-and-exports_all-features.txt @@ -10020,9 +10020,7 @@ longname4880 => zza (export "OBa" (func $foo2)) (export "PBa" (tag $tag1)) (func $foo1 (type $0) - (nop) ) (func $foo2 (type $0) - (nop) ) ) diff --git a/test/passes/minify-imports_all-features.txt b/test/passes/minify-imports_all-features.txt index 536a6a042..ec2556439 100644 --- a/test/passes/minify-imports_all-features.txt +++ b/test/passes/minify-imports_all-features.txt @@ -10014,9 +10014,7 @@ longname4880 => zza (export "foo2" (func $foo2)) (export "tag1" (tag $tag1)) (func $foo1 (type $0) - (nop) ) (func $foo2 (type $0) - (nop) ) ) diff --git a/test/passes/post-emscripten.txt b/test/passes/post-emscripten.txt index 186cdeb76..6cefe366f 100644 --- a/test/passes/post-emscripten.txt +++ b/test/passes/post-emscripten.txt @@ -43,10 +43,8 @@ ) ) (func $other_safe (param $0 i32) (param $1 f32) - (nop) ) (func $other_unsafe (param $0 i32) (param $1 f32) - (nop) ) (func $deep_safe (param $0 i32) (param $1 f32) (call $other_safe @@ -84,7 +82,6 @@ ) ) (func $other_safe (param $0 i32) (param $1 f32) - (nop) ) ) (module diff --git a/test/passes/print-function-map.txt b/test/passes/print-function-map.txt index 228276e06..5cf4c5843 100644 --- a/test/passes/print-function-map.txt +++ b/test/passes/print-function-map.txt @@ -5,9 +5,7 @@ (type $0 (func)) (import "env" "foo" (func $Foo)) (func $bar - (nop) ) (func $baz - (nop) ) ) diff --git a/test/passes/remove-unused-brs_enable-multivalue.txt b/test/passes/remove-unused-brs_enable-multivalue.txt index f3c1b7d77..ee6efbf4d 100644 --- a/test/passes/remove-unused-brs_enable-multivalue.txt +++ b/test/passes/remove-unused-brs_enable-multivalue.txt @@ -529,7 +529,6 @@ ) ) (loop $in2 - (nop) ) (loop $in3 (block $out2 diff --git a/test/passes/remove-unused-names_merge-blocks_all-features.txt b/test/passes/remove-unused-names_merge-blocks_all-features.txt index ec63edd5e..2169d636b 100644 --- a/test/passes/remove-unused-names_merge-blocks_all-features.txt +++ b/test/passes/remove-unused-names_merge-blocks_all-features.txt @@ -1657,7 +1657,6 @@ (type $1 (func (param i32))) (tag $e (param i32)) (func $foo (type $0) - (nop) ) (func $throw (type $0) (nop) diff --git a/test/passes/remove-unused-nonfunction-module-elements_all-features.txt b/test/passes/remove-unused-nonfunction-module-elements_all-features.txt index e125373d8..c56b99253 100644 --- a/test/passes/remove-unused-nonfunction-module-elements_all-features.txt +++ b/test/passes/remove-unused-nonfunction-module-elements_all-features.txt @@ -111,7 +111,6 @@ (data $0 (i32.const 1) "hello, world!") (elem $0 (i32.const 0) $waka) (func $waka (type $0) - (nop) ) ) (module @@ -228,7 +227,6 @@ (data $0 (global.get $memoryBase) "hello, world!") (elem $0 (global.get $tableBase) $waka) (func $waka (type $0) - (nop) ) ) (module @@ -347,6 +345,5 @@ (tag $e1 (param i64)) (export "e1" (tag $e1)) (func $f (type $0) (param $0 i32) - (nop) ) ) diff --git a/test/passes/spill-pointers.txt b/test/passes/spill-pointers.txt index 0c51683ef..52d7b19a1 100644 --- a/test/passes/spill-pointers.txt +++ b/test/passes/spill-pointers.txt @@ -12,7 +12,6 @@ (table $0 1 1 funcref) (elem $0 (i32.const 0)) (func $nothing - (nop) ) (func $not-alive (local $x i32) @@ -698,7 +697,6 @@ (global.get $stack_ptr) ) (func $nothing - (nop) ) (func $not-alive (local $x i32) |