Remove (attr 0) from tag text format (#3946)

This attribute is always 0 and reserved for future use. In Binayren's
unofficial text format we were writing this field as `(attr 0)`, but we
have recently come to the conclusion that this is not necessary.

Relevant discussion:
https://github.com/WebAssembly/exception-handling/pull/160#discussion_r653254680

15 files changed, 21 insertions, 21 deletions

diff --git a/test/lit/passes/coalesce-locals-eh.wast b/test/lit/passes/coalesce-locals-eh.wast
index f13ba5550..d2d7136fc 100644
--- a/test/lit/passes/coalesce-locals-eh.wast
+++ b/test/lit/passes/coalesce-locals-eh.wast
@@ -9,7 +9,7 @@
     (i32.const 1984)
   )
 
- (tag $e (attr 0))
+ (tag $e)
   ;; CHECK:      (func $bug-cfg-traversal (param $0 i32) (result i32)
   ;; CHECK-NEXT:  (try $try
   ;; CHECK-NEXT:   (do
diff --git a/test/lit/passes/code-folding-eh.wast b/test/lit/passes/code-folding-eh.wast
index e810e5c01..9ca8f1ea7 100644
--- a/test/lit/passes/code-folding-eh.wast
+++ b/test/lit/passes/code-folding-eh.wast
@@ -3,7 +3,7 @@
 ;; RUN:   | filecheck %s
 
 (module
-  (tag $e-i32 (attr 0) (param i32))
+  (tag $e-i32 (param i32))
 
   ;; CHECK:      (func $pop-test
   ;; CHECK-NEXT:  (block $folding-inner0
diff --git a/test/lit/passes/code-pushing-eh.wast b/test/lit/passes/code-pushing-eh.wast
index 37ca0cc5a..f45ef5c3f 100644
--- a/test/lit/passes/code-pushing-eh.wast
+++ b/test/lit/passes/code-pushing-eh.wast
@@ -2,7 +2,7 @@
 ;; RUN: wasm-opt %s --code-pushing -all -S -o - | filecheck %s
 
 (module
-  (tag $e (attr 0) (param i32))
+  (tag $e (param i32))
 
   ;; CHECK:      (func $cant-push-past-call
   ;; CHECK-NEXT:  (local $x i32)
diff --git a/test/lit/passes/dce-eh.wast b/test/lit/passes/dce-eh.wast
index d29056c41..af216765c 100644
--- a/test/lit/passes/dce-eh.wast
+++ b/test/lit/passes/dce-eh.wast
@@ -5,7 +5,7 @@
 ;; reachable
 (module
   (func $foo)
-  (tag $e (attr 0))
+  (tag $e)
 
   ;; CHECK:      (func $try_unreachable
   ;; CHECK-NEXT:  (try $try
diff --git a/test/lit/passes/inlining-eh.wast b/test/lit/passes/inlining-eh.wast
index 6b648d380..e2b512410 100644
--- a/test/lit/passes/inlining-eh.wast
+++ b/test/lit/passes/inlining-eh.wast
@@ -4,7 +4,7 @@
 (module
   ;; ---------------------------------------------------------------------------
   (import "a" "b" (func $foo (result i32)))
-  (tag $tag$0 (attr 0) (param i32))
+  (tag $tag$0 (param i32))
   (func $callee-with-label
     (try $label
       (do)
diff --git a/test/lit/passes/instrument-locals-eh.wast b/test/lit/passes/instrument-locals-eh.wast
index 88b4d5526..a55a05416 100644
--- a/test/lit/passes/instrument-locals-eh.wast
+++ b/test/lit/passes/instrument-locals-eh.wast
@@ -2,7 +2,7 @@
 ;; RUN: wasm-opt %s --instrument-locals -all -S -o - | filecheck %s
 
 (module
-  (tag $e (attr 0) (param i32))
+  (tag $e (param i32))
 
   ;; CHECK:      (func $test
   ;; CHECK-NEXT:  (local $x i32)
diff --git a/test/lit/passes/optimize-instructions-eh.wast b/test/lit/passes/optimize-instructions-eh.wast
index 23c8f9fa5..2c7f83aee 100644
--- a/test/lit/passes/optimize-instructions-eh.wast
+++ b/test/lit/passes/optimize-instructions-eh.wast
@@ -4,7 +4,7 @@
 
 (module
   (func $dummy)
-  (tag $e (attr 0) (param i32))
+  (tag $e (param i32))
 
   ;; The following are the unit tests for Properties::getFallthrough for EH
   ;; instructions, which are used in one of binary optimizations in
diff --git a/test/lit/passes/poppify.wast b/test/lit/passes/poppify.wast
index 69e6fc17e..5becc6556 100644
--- a/test/lit/passes/poppify.wast
+++ b/test/lit/passes/poppify.wast
@@ -3,7 +3,7 @@
 ;; RUN: wasm-opt %s --poppify --no-validation -all -S -o - | filecheck %s
 
 (module
-  (tag $e (attr 0) (param i32))
+  (tag $e (param i32))
 
   ;; CHECK:      (func $id (param $x i32) (result i32)
   ;; CHECK-NEXT:  (local.get $x)
diff --git a/test/lit/passes/remove-unused-module-elements-eh.wast b/test/lit/passes/remove-unused-module-elements-eh.wast
index 2a6a3b6b9..da6d6ff8a 100644
--- a/test/lit/passes/remove-unused-module-elements-eh.wast
+++ b/test/lit/passes/remove-unused-module-elements-eh.wast
@@ -8,13 +8,13 @@
   ;; CHECK: (tag $e-export
   ;; CHECK: (tag $e-throw
   ;; CHECK: (tag $e-catch
-  (tag $e-remove (attr 0) (type $0))   ;; can be removed
-  (tag $e-export (attr 0) (param i64)) ;; cannot be removed (exported)
-  (tag $e-throw (attr 0) (type $0))    ;; cannot be removed (used in throw)
-  (tag $e-catch (attr 0) (type $0))    ;; cannot be removed (used in catch)
+  (tag $e-remove (type $0))   ;; can be removed
+  (tag $e-export (param i64)) ;; cannot be removed (exported)
+  (tag $e-throw (type $0))    ;; cannot be removed (used in throw)
+  (tag $e-catch (type $0))    ;; cannot be removed (used in catch)
 
   (export "e-export" (tag $e-export))
-  (import "env" "e" (tag $e-import (attr 0) (param i32)))
+  (import "env" "e" (tag $e-import (param i32)))
 
   (start $start)
   (func $start
diff --git a/test/lit/passes/remove-unused-names-eh.wast b/test/lit/passes/remove-unused-names-eh.wast
index 3244bd375..cf16dda0b 100644
--- a/test/lit/passes/remove-unused-names-eh.wast
+++ b/test/lit/passes/remove-unused-names-eh.wast
@@ -2,7 +2,7 @@
 ;; RUN: wasm-opt %s --remove-unused-names -all -S -o - | filecheck %s
 
 (module
-  (tag $tag$0 (attr 0) (param i32))
+  (tag $tag$0 (param i32))
 
   ;; CHECK:      (func $func0
   ;; CHECK-NEXT:  (try $label$9
diff --git a/test/lit/passes/rse-eh.wast b/test/lit/passes/rse-eh.wast
index f71c4886d..7d21ef820 100644
--- a/test/lit/passes/rse-eh.wast
+++ b/test/lit/passes/rse-eh.wast
@@ -2,8 +2,8 @@
 ;; RUN: wasm-opt %s --rse -all -S -o - | filecheck %s
 
 (module
-  (tag $e (attr 0) (param i32))
-  (tag $e2 (attr 0))
+  (tag $e (param i32))
+  (tag $e2)
 
   ;; CHECK:      (func $try1
   ;; CHECK-NEXT:  (local $x i32)
diff --git a/test/lit/passes/simplify-locals-eh.wast b/test/lit/passes/simplify-locals-eh.wast
index 9a7a94cf7..74501584c 100644
--- a/test/lit/passes/simplify-locals-eh.wast
+++ b/test/lit/passes/simplify-locals-eh.wast
@@ -2,7 +2,7 @@
 ;; RUN: wasm-opt %s --simplify-locals -all -S -o - | filecheck %s
 
 (module
-  (tag $e-i32 (attr 0) (param i32))
+  (tag $e-i32 (param i32))
   ;; CHECK:      (func $foo (param $0 i32) (param $1 i32)
   ;; CHECK-NEXT:  (nop)
   ;; CHECK-NEXT: )
diff --git a/test/lit/passes/stack-ir-eh.wast b/test/lit/passes/stack-ir-eh.wast
index 86ada5059..228f00773 100644
--- a/test/lit/passes/stack-ir-eh.wast
+++ b/test/lit/passes/stack-ir-eh.wast
@@ -2,7 +2,7 @@
 ;; RUN:   -all -S -o - | filecheck %s
 
 (module
-  (tag $e0 (attr 0) (param i32))
+  (tag $e0 (param i32))
 
   ;; CHECK:      (func $eh
   ;; CHECK-NEXT:  try $l0
diff --git a/test/lit/passes/stack-ir-roundtrip-eh.wast b/test/lit/passes/stack-ir-roundtrip-eh.wast
index cbc81f294..df68d3f8a 100644
--- a/test/lit/passes/stack-ir-roundtrip-eh.wast
+++ b/test/lit/passes/stack-ir-roundtrip-eh.wast
@@ -2,7 +2,7 @@
 ;; RUN: wasm-opt %s --generate-stack-ir --roundtrip -all -S -o - | filecheck %s
 
 (module
- (tag $tag (attr 0) (param i32))
+ (tag $tag (param i32))
   ;; CHECK:      (func $delegate-child
   ;; CHECK-NEXT:  (try $label$9
   ;; CHECK-NEXT:   (do
diff --git a/test/lit/passes/vacuum-eh.wast b/test/lit/passes/vacuum-eh.wast
index 705f423f0..a4417f0ae 100644
--- a/test/lit/passes/vacuum-eh.wast
+++ b/test/lit/passes/vacuum-eh.wast
@@ -2,8 +2,8 @@
 ;; RUN: wasm-opt %s --vacuum -all -S -o - | filecheck %s
 
 (module
-  (tag $e (attr 0) (param i32))
-  (tag $e2 (attr 0) (param i32))
+  (tag $e (param i32))
+  (tag $e2 (param i32))
 
   ;; CHECK:      (func $try-test
   ;; CHECK-NEXT:  (nop)