Remove the --hybrid and --nominal command line options (#5669)

After this change, the only type system usable from the tools will be the
standard isorecursive type system. The nominal type system is still usable via
the API, but it will be removed entirely in a follow-on PR.

10 files changed, 0 insertions, 67 deletions

diff --git a/test/lit/help/wasm-as.test b/test/lit/help/wasm-as.test
index 976c66225..97f11a7d6 100644
--- a/test/lit/help/wasm-as.test
+++ b/test/lit/help/wasm-as.test
@@ -119,13 +119,6 @@
 ;; CHECK-NEXT:                                        passes being run. Must be in the form
 ;; CHECK-NEXT:                                        KEY@VALUE
 ;; CHECK-NEXT:
-;; CHECK-NEXT:   --nominal                            Force all GC type definitions to be
-;; CHECK-NEXT:                                        parsed as nominal.
-;; CHECK-NEXT:
-;; CHECK-NEXT:   --hybrid                             Force all GC type definitions to be
-;; CHECK-NEXT:                                        parsed using the isorecursive hybrid type
-;; CHECK-NEXT:                                        system.
-;; CHECK-NEXT:
 ;; CHECK-NEXT:   --closed-world,-cw                   Assume code outside of the module does
 ;; CHECK-NEXT:                                        not inspect or interact with GC and
 ;; CHECK-NEXT:                                        function references, even if they are
diff --git a/test/lit/help/wasm-ctor-eval.test b/test/lit/help/wasm-ctor-eval.test
index 34281ea42..2d27f619a 100644
--- a/test/lit/help/wasm-ctor-eval.test
+++ b/test/lit/help/wasm-ctor-eval.test
@@ -126,13 +126,6 @@
 ;; CHECK-NEXT:                                        passes being run. Must be in the form
 ;; CHECK-NEXT:                                        KEY@VALUE
 ;; CHECK-NEXT:
-;; CHECK-NEXT:   --nominal                            Force all GC type definitions to be
-;; CHECK-NEXT:                                        parsed as nominal.
-;; CHECK-NEXT:
-;; CHECK-NEXT:   --hybrid                             Force all GC type definitions to be
-;; CHECK-NEXT:                                        parsed using the isorecursive hybrid type
-;; CHECK-NEXT:                                        system.
-;; CHECK-NEXT:
 ;; CHECK-NEXT:   --closed-world,-cw                   Assume code outside of the module does
 ;; CHECK-NEXT:                                        not inspect or interact with GC and
 ;; CHECK-NEXT:                                        function references, even if they are
diff --git a/test/lit/help/wasm-dis.test b/test/lit/help/wasm-dis.test
index ce2328452..0d5cd8dc2 100644
--- a/test/lit/help/wasm-dis.test
+++ b/test/lit/help/wasm-dis.test
@@ -112,13 +112,6 @@
 ;; CHECK-NEXT:                                        passes being run. Must be in the form
 ;; CHECK-NEXT:                                        KEY@VALUE
 ;; CHECK-NEXT:
-;; CHECK-NEXT:   --nominal                            Force all GC type definitions to be
-;; CHECK-NEXT:                                        parsed as nominal.
-;; CHECK-NEXT:
-;; CHECK-NEXT:   --hybrid                             Force all GC type definitions to be
-;; CHECK-NEXT:                                        parsed using the isorecursive hybrid type
-;; CHECK-NEXT:                                        system.
-;; CHECK-NEXT:
 ;; CHECK-NEXT:   --closed-world,-cw                   Assume code outside of the module does
 ;; CHECK-NEXT:                                        not inspect or interact with GC and
 ;; CHECK-NEXT:                                        function references, even if they are
diff --git a/test/lit/help/wasm-emscripten-finalize.test b/test/lit/help/wasm-emscripten-finalize.test
index 5bcf2c469..8ce4d94f0 100644
--- a/test/lit/help/wasm-emscripten-finalize.test
+++ b/test/lit/help/wasm-emscripten-finalize.test
@@ -159,13 +159,6 @@
 ;; CHECK-NEXT:                                        passes being run. Must be in the form
 ;; CHECK-NEXT:                                        KEY@VALUE
 ;; CHECK-NEXT:
-;; CHECK-NEXT:   --nominal                            Force all GC type definitions to be
-;; CHECK-NEXT:                                        parsed as nominal.
-;; CHECK-NEXT:
-;; CHECK-NEXT:   --hybrid                             Force all GC type definitions to be
-;; CHECK-NEXT:                                        parsed using the isorecursive hybrid type
-;; CHECK-NEXT:                                        system.
-;; CHECK-NEXT:
 ;; CHECK-NEXT:   --closed-world,-cw                   Assume code outside of the module does
 ;; CHECK-NEXT:                                        not inspect or interact with GC and
 ;; CHECK-NEXT:                                        function references, even if they are
diff --git a/test/lit/help/wasm-fuzz-types.test b/test/lit/help/wasm-fuzz-types.test
index 49e491358..5bd5974fd 100644
--- a/test/lit/help/wasm-fuzz-types.test
+++ b/test/lit/help/wasm-fuzz-types.test
@@ -13,10 +13,6 @@
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --verbose,-v Print extra information
 ;; CHECK-NEXT:
-;; CHECK-NEXT:   --nominal    Use the nominal type system
-;; CHECK-NEXT:
-;; CHECK-NEXT:   --hybrid     Use the isorecursive hybrid type system (default)
-;; CHECK-NEXT:
 ;; CHECK-NEXT:
 ;; CHECK-NEXT: General options:
 ;; CHECK-NEXT: ----------------
diff --git a/test/lit/help/wasm-metadce.test b/test/lit/help/wasm-metadce.test
index 59cbcc216..5a2f22c01 100644
--- a/test/lit/help/wasm-metadce.test
+++ b/test/lit/help/wasm-metadce.test
@@ -160,13 +160,6 @@
 ;; CHECK-NEXT:                                        passes being run. Must be in the form
 ;; CHECK-NEXT:                                        KEY@VALUE
 ;; CHECK-NEXT:
-;; CHECK-NEXT:   --nominal                            Force all GC type definitions to be
-;; CHECK-NEXT:                                        parsed as nominal.
-;; CHECK-NEXT:
-;; CHECK-NEXT:   --hybrid                             Force all GC type definitions to be
-;; CHECK-NEXT:                                        parsed using the isorecursive hybrid type
-;; CHECK-NEXT:                                        system.
-;; CHECK-NEXT:
 ;; CHECK-NEXT:   --closed-world,-cw                   Assume code outside of the module does
 ;; CHECK-NEXT:                                        not inspect or interact with GC and
 ;; CHECK-NEXT:                                        function references, even if they are
diff --git a/test/lit/help/wasm-opt.test b/test/lit/help/wasm-opt.test
index 351f2c93e..ae1768f9f 100644
--- a/test/lit/help/wasm-opt.test
+++ b/test/lit/help/wasm-opt.test
@@ -676,13 +676,6 @@
 ;; CHECK-NEXT:                                                 optimization passes being run.
 ;; CHECK-NEXT:                                                 Must be in the form KEY@VALUE
 ;; CHECK-NEXT:
-;; CHECK-NEXT:   --nominal                                     Force all GC type definitions to
-;; CHECK-NEXT:                                                 be parsed as nominal.
-;; CHECK-NEXT:
-;; CHECK-NEXT:   --hybrid                                      Force all GC type definitions to
-;; CHECK-NEXT:                                                 be parsed using the isorecursive
-;; CHECK-NEXT:                                                 hybrid type system.
-;; CHECK-NEXT:
 ;; CHECK-NEXT:   --closed-world,-cw                            Assume code outside of the
 ;; CHECK-NEXT:                                                 module does not inspect or
 ;; CHECK-NEXT:                                                 interact with GC and function
diff --git a/test/lit/help/wasm-reduce.test b/test/lit/help/wasm-reduce.test
index 333cae9ae..5fb79bf88 100644
--- a/test/lit/help/wasm-reduce.test
+++ b/test/lit/help/wasm-reduce.test
@@ -148,13 +148,6 @@
 ;; CHECK-NEXT:                                        passes being run. Must be in the form
 ;; CHECK-NEXT:                                        KEY@VALUE
 ;; CHECK-NEXT:
-;; CHECK-NEXT:   --nominal                            Force all GC type definitions to be
-;; CHECK-NEXT:                                        parsed as nominal.
-;; CHECK-NEXT:
-;; CHECK-NEXT:   --hybrid                             Force all GC type definitions to be
-;; CHECK-NEXT:                                        parsed using the isorecursive hybrid type
-;; CHECK-NEXT:                                        system.
-;; CHECK-NEXT:
 ;; CHECK-NEXT:   --closed-world,-cw                   Assume code outside of the module does
 ;; CHECK-NEXT:                                        not inspect or interact with GC and
 ;; CHECK-NEXT:                                        function references, even if they are
diff --git a/test/lit/help/wasm-split.test b/test/lit/help/wasm-split.test
index e0cdf3ca4..8b017d43d 100644
--- a/test/lit/help/wasm-split.test
+++ b/test/lit/help/wasm-split.test
@@ -228,13 +228,6 @@
 ;; CHECK-NEXT:                                        passes being run. Must be in the form
 ;; CHECK-NEXT:                                        KEY@VALUE
 ;; CHECK-NEXT:
-;; CHECK-NEXT:   --nominal                            Force all GC type definitions to be
-;; CHECK-NEXT:                                        parsed as nominal.
-;; CHECK-NEXT:
-;; CHECK-NEXT:   --hybrid                             Force all GC type definitions to be
-;; CHECK-NEXT:                                        parsed using the isorecursive hybrid type
-;; CHECK-NEXT:                                        system.
-;; CHECK-NEXT:
 ;; CHECK-NEXT:   --closed-world,-cw                   Assume code outside of the module does
 ;; CHECK-NEXT:                                        not inspect or interact with GC and
 ;; CHECK-NEXT:                                        function references, even if they are
diff --git a/test/lit/help/wasm2js.test b/test/lit/help/wasm2js.test
index 502419cf2..f75d37965 100644
--- a/test/lit/help/wasm2js.test
+++ b/test/lit/help/wasm2js.test
@@ -635,13 +635,6 @@
 ;; CHECK-NEXT:                                                 optimization passes being run.
 ;; CHECK-NEXT:                                                 Must be in the form KEY@VALUE
 ;; CHECK-NEXT:
-;; CHECK-NEXT:   --nominal                                     Force all GC type definitions to
-;; CHECK-NEXT:                                                 be parsed as nominal.
-;; CHECK-NEXT:
-;; CHECK-NEXT:   --hybrid                                      Force all GC type definitions to
-;; CHECK-NEXT:                                                 be parsed using the isorecursive
-;; CHECK-NEXT:                                                 hybrid type system.
-;; CHECK-NEXT:
 ;; CHECK-NEXT:   --closed-world,-cw                            Assume code outside of the
 ;; CHECK-NEXT:                                                 module does not inspect or
 ;; CHECK-NEXT:                                                 interact with GC and function