Remove legacy GC text syntax (WebAssembly#5929)

Remove the old forms of ref.test and ref.cast that took heap types instead of
ref types and remove the old array.init_static name for array.new_fixed.

Author: tlively

scripts/gen-s-parser.py

@@ -583,7 +583,6 @@
     ("array.new_default",    "makeArrayNew(s, true)"),
     ("array.new_data",       "makeArrayNewData(s)"),
     ("array.new_elem",       "makeArrayNewElem(s)"),
-    ("array.init_static",    "makeArrayNewFixed(s)"),  # deprecated
     ("array.new_fixed",      "makeArrayNewFixed(s)"),
     ("array.get",            "makeArrayGet(s)"),
     ("array.get_s",          "makeArrayGet(s, true)"),

src/gen-s-parser.inc

@@ -46,9 +46,6 @@ switch (buf[0]) {
               case 'e':
                 if (op == "array.init_elem"sv) { return makeArrayInitElem(s); }
                 goto parse_error;
-              case 's':
-                if (op == "array.init_static"sv) { return makeArrayNewFixed(s); }
-                goto parse_error;
               default: goto parse_error;
             }
           }
@@ -3650,13 +3647,6 @@ switch (buf[0]) {
                   return *ret;
                 }
                 goto parse_error;
-              case 's':
-                if (op == "array.init_static"sv) {
-                  auto ret = makeArrayNewFixed(ctx, pos);
-                  CHECK_ERR(ret);
-                  return *ret;
-                }
-                goto parse_error;
               default: goto parse_error;
             }
           }

src/wasm/wasm-s-parser.cpp

@@ -2854,44 +2854,14 @@ Expression* SExpressionWasmBuilder::makeI31Get(Element& s, bool signed_) {
 }
 
 Expression* SExpressionWasmBuilder::makeRefTest(Element& s) {
-  int i = 1;
-  Type castType;
-  if (s[i]->isList() ||
-      !(s[i]->dollared() ||
-        stringToType(s[i]->str(), true /* allowError */) == Type::none)) {
-    castType = elementToType(*s[i++]);
-  } else {
-    // legacy syntax
-    auto nullability = NonNullable;
-    if (s[1]->str().str == "null") {
-      nullability = Nullable;
-      ++i;
-    }
-    auto type = parseHeapType(*s[i++]);
-    castType = Type(type, nullability);
-  }
-  auto* ref = parseExpression(*s[i++]);
+  Type castType = elementToType(*s[1]);
+  auto* ref = parseExpression(*s[2]);
   return Builder(wasm).makeRefTest(ref, castType);
 }
 
 Expression* SExpressionWasmBuilder::makeRefCast(Element& s) {
-  int i = 1;
-  Type castType;
-  if (s[i]->isList() ||
-      !(s[i]->dollared() ||
-        stringToType(s[i]->str(), true /* allowError */) == Type::none)) {
-    castType = elementToType(*s[i++]);
-  } else {
-    // legacy syntax
-    Nullability nullability = NonNullable;
-    if (s[i]->str().str == "null") {
-      nullability = Nullable;
-      ++i;
-    }
-    auto type = parseHeapType(*s[i++]);
-    castType = Type(type, nullability);
-  }
-  auto* ref = parseExpression(*s[i++]);
+  Type castType = elementToType(*s[1]);
+  auto* ref = parseExpression(*s[2]);
   return Builder(wasm).makeRefCast(ref, castType);
 }
 

test/lit/array-init-static.wast

@@ -620,10 +620,10 @@
    (drop
     ;; This should not crash due to the new unreachable below.
     (br_on_cast $outer (ref none) (ref none)
-     (ref.cast none
+     (ref.cast (ref none)
       ;; This will be optimized to a drop + unreachable.
       (br_on_cast $outer (ref none) (ref none)
-       (ref.cast none
+       (ref.cast (ref none)
         (local.get $0)
        )
       )