From cd94f8af963ea8233fc15db35ff8d9e70aff22cf Mon Sep 17 00:00:00 2001
From: Thomas Lively <tlively@google.com>
Date: Mon, 18 Sep 2023 10:45:36 -0700
Subject: Remove legacy type defintion text syntax (#5948)

Remove support for the "struct_subtype", "array_subtype", "func_subtype", and
"extends" notations we used at various times to declare WasmGC types, leaving
only support for the standard text fromat for declaring types. Update all the
tests using the old formats and delete tests that existed solely to test the old
formats.
---
 test/lit/isorecursive-output-ordering.wast | 34 +++++++++++++++---------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'test/lit/isorecursive-output-ordering.wast')

diff --git a/test/lit/isorecursive-output-ordering.wast b/test/lit/isorecursive-output-ordering.wast
index 43bda9a21..54d991301 100644
--- a/test/lit/isorecursive-output-ordering.wast
+++ b/test/lit/isorecursive-output-ordering.wast
@@ -15,22 +15,22 @@
 
   ;; CHECK:      (rec
   ;; CHECK-NEXT:  (type $unused-1 (sub (struct )))
-  (type $unused-1 (struct_subtype data))
+  (type $unused-1 (sub (struct)))
   ;; CHECK:       (type $unused-2 (sub (struct )))
-  (type $unused-2 (struct_subtype data))
+  (type $unused-2 (sub (struct)))
   ;; CHECK:       (type $unused-3 (sub (struct )))
-  (type $unused-3 (struct_subtype data))
+  (type $unused-3 (sub (struct)))
   ;; CHECK:       (type $unused-4 (sub (struct )))
-  (type $unused-4 (struct_subtype data))
+  (type $unused-4 (sub (struct)))
   ;; CHECK:       (type $used-a-lot (sub (struct )))
-  (type $used-a-lot (struct_subtype data))
+  (type $used-a-lot (sub (struct)))
   ;; CHECK:       (type $unused-5 (sub (struct )))
-  (type $unused-5 (struct_subtype data))
+  (type $unused-5 (sub (struct)))
  )
 
  (rec
-  (type $unused-6 (struct_subtype data))
-  (type $used-a-bit (struct_subtype data))
+  (type $unused-6 (sub (struct)))
+  (type $used-a-bit (sub (struct)))
  )
 
  ;; CHECK:      (func $use (type $8) (param $0 (ref $used-a-lot)) (param $1 (ref $used-a-lot)) (param $2 (ref $used-a-lot)) (param $3 (ref $used-a-lot)) (param $4 (ref $used-a-lot)) (param $5 (ref $used-a-lot)) (result (ref $used-a-bit) (ref $used-a-bit) (ref $used-a-bit) (ref $used-a-bit))
@@ -48,9 +48,9 @@
  (rec
   ;; CHECK:      (rec
   ;; CHECK-NEXT:  (type $leaf (sub (struct )))
-  (type $leaf (struct_subtype data))
+  (type $leaf (sub (struct)))
   ;; CHECK:       (type $unused (sub (struct )))
-  (type $unused (struct_subtype data))
+  (type $unused (sub (struct)))
  )
 
  (rec
@@ -61,22 +61,22 @@
 
   ;; CHECK:      (rec
   ;; CHECK-NEXT:  (type $twig (sub (struct )))
-  (type $twig (struct_subtype data))
+  (type $twig (sub (struct)))
   ;; CHECK:       (type $used-a-bit (sub (struct (field (ref $leaf)))))
-  (type $used-a-bit (struct_subtype (ref $leaf) data))
+  (type $used-a-bit (sub (struct (ref $leaf))))
  )
 
  (rec
-  (type $shrub (struct_subtype $leaf))
-  (type $used-a-ton (struct_subtype data))
+  (type $shrub (sub $leaf (struct)))
+  (type $used-a-ton (sub (struct)))
  )
 
  (rec
   ;; CHECK:      (rec
   ;; CHECK-NEXT:  (type $root (sub (struct )))
-  (type $root (struct_subtype data))
+  (type $root (sub (struct)))
   ;; CHECK:       (type $used-a-lot (sub $twig (struct )))
-  (type $used-a-lot (struct_subtype $twig))
+  (type $used-a-lot (sub $twig (struct)))
  )
 
  ;; CHECK:      (func $use (type $8) (param $0 (ref $used-a-lot)) (param $1 (ref $used-a-lot)) (param $2 (ref $used-a-lot)) (param $3 (ref $used-a-lot)) (param $4 (ref $used-a-lot)) (param $5 (ref $used-a-lot)) (result (ref $used-a-bit) (ref $used-a-bit) (ref $used-a-bit))
@@ -100,7 +100,7 @@
 
  (rec
   ;; CHECK:      (type $contains-basic (sub (struct (field (ref any)))))
-  (type $contains-basic (struct_subtype (ref any) data))
+  (type $contains-basic (sub (struct (ref any))))
  )
 
  ;; CHECK:      (func $use (type $1) (param $0 (ref $contains-basic))
-- 
cgit v1.2.3