[Draft][Parser] Enable the new text parser by default

Author: tlively

check.py

@@ -242,9 +242,9 @@ def check_expected(actual, expected):
                 for module, asserts in support.split_wast(wast):
                     print('        testing split module', split_num)
                     split_num += 1
-                    support.write_wast('split.wast', module, asserts)
+                    support.write_wast('split.wast', module)
                     run_opt_test('split.wast')    # also that our optimizer doesn't break on it
-                    result_wast_file = shared.binary_format_check('split.wast', verify_final_result=False, original_wast=wast)
+                    result_wast_file = shared.binary_format_check('split.wast', verify_final_result=False)
                     with open(result_wast_file) as f:
                         result_wast = f.read()
                         # add the asserts, and verify that the test still passes

scripts/test/shared.py

@@ -457,7 +457,7 @@ def get_tests(test_dir, extensions=[], recursive=False):
 # check utilities
 
 def binary_format_check(wast, verify_final_result=True, wasm_as_args=['-g'],
-                        binary_suffix='.fromBinary', original_wast=None):
+                        binary_suffix='.fromBinary'):
     # checks we can convert the wast to binary and back
 
     print('         (binary format check)')

src/wasm/wasm-io.cpp

@@ -33,7 +33,7 @@
 
 namespace wasm {
 
-bool useNewWATParser = false;
+bool useNewWATParser = true;
 
 #define DEBUG_TYPE "writer"
 

src/wasm/wasm-ir-builder.cpp

@@ -1553,6 +1553,9 @@ Result<> IRBuilder::makeThrowRef() {
 }
 
 Result<> IRBuilder::makeTupleMake(uint32_t arity) {
+  if (arity < 2) {
+    return Err{"tuple arity must be at least 2"};
+  }
   TupleMake curr(wasm.allocator);
   curr.operands.resize(arity);
   CHECK_ERR(visitTupleMake(&curr));
@@ -1561,13 +1564,22 @@ Result<> IRBuilder::makeTupleMake(uint32_t arity) {
 }
 
 Result<> IRBuilder::makeTupleExtract(uint32_t arity, uint32_t index) {
+  if (index >= arity) {
+    return Err{"tuple index out of bounds"};
+  }
+  if (arity < 2) {
+    return Err{"tuple arity must be at least 2"};
+  }
   TupleExtract curr;
   CHECK_ERR(visitTupleExtract(&curr, arity));
   push(builder.makeTupleExtract(curr.tuple, index));
   return Ok{};
 }
 
 Result<> IRBuilder::makeTupleDrop(uint32_t arity) {
+  if (arity < 2) {
+    return Err{"tuple arity must be at least 2"};
+  }
   Drop curr;
   CHECK_ERR(visitDrop(&curr, arity));
   push(builder.makeDrop(curr.value));

test/ctor-eval/bad-indirect-call3.wast.out

@@ -5,7 +5,7 @@
  (memory $0 256 256)
  (data $0 (i32.const 10) "waka waka waka waka waka")
  (table $0 1 1 funcref)
- (elem $0 (i32.const 0) $callee)
+ (elem $implicit-elem (i32.const 0) $callee)
  (export "sig_mismatch" (func $sig_mismatch))
  (func $callee (type $0) (param $0 externref)
   (i32.store8