Clean up some error message handling in the roundtrip tests (#1552)

* Remove an error message case that's no longer needed

Looks like spec tests were updated in the meantime.

* Align an error message between wasmparser and the spec interpreter

Helps remove a special case for error messages.

* Remove some special-cases with error messages

These issues have been fixed in the upstream proposals.

* Remove some more special-cased error messages

No longer needed.

Author: alexcrichton

crates/wasmparser/src/binary_reader.rs

@@ -705,7 +705,7 @@ impl<'a> BinaryReader<'a> {
         }
         let bytes = self.read_bytes(len)?;
         str::from_utf8(bytes).map_err(|_| {
-            BinaryReaderError::new("invalid UTF-8 encoding", self.original_position() - 1)
+            BinaryReaderError::new("malformed UTF-8 encoding", self.original_position() - 1)
         })
     }
 

tests/roundtrip.rs

@@ -667,18 +667,10 @@ fn error_matches(error: &str, message: &str) -> bool {
         return error.contains("unexpected end-of-file");
     }
 
-    if message == "malformed UTF-8 encoding" {
-        return error.contains("invalid UTF-8 encoding");
-    }
-
     if message == "duplicate identifier" {
         return error.contains("duplicate") && error.contains("identifier");
     }
 
-    if message == "unknown memory" {
-        return error.contains("no linear memories are present");
-    }
-
     // wasmparser differentiates these cases, the spec interpreter apparently
     // doesn't
     if message == "function and code section have inconsistent lengths" {
@@ -715,9 +707,7 @@ fn error_matches(error: &str, message: &str) -> bool {
             // the spec interpreter will read past section boundaries when
             // decoding, wasmparser won't, producing different errors.
             || error.contains("unexpected end-of-file")
-            || error.contains("malformed section id")
-            // FIXME(WebAssembly/memory64#45)
-            || error.contains("trailing bytes at end of section");
+            || error.contains("malformed section id");
     }
 
     if message == "integer too large" {
@@ -732,21 +722,14 @@ fn error_matches(error: &str, message: &str) -> bool {
             // were inflated to a larger size while not updating the binary
             // encoding of the size of the section.
             || error.contains("invalid var_u32: integer representation too long")
-            || error.contains("malformed section id")
-            // FIXME(WebAssembly/memory64#45)
-            || error.contains("trailing bytes at end of section")
-            // It's tests... again... waiting for memory64 to get merged.
-            || error.contains("memory64 must be enabled for 64-bit tables");
+            || error.contains("malformed section id");
     }
 
     // wasmparser blames a truncated file here, the spec interpreter blames the
     // section counts/lengths.
     if message == "length out of bounds" || message == "unexpected end of section or function" {
         return error.contains("unexpected end-of-file")
-            || error.contains("control frames remain at end of function")
-            // This is the same case as "unexpected end" (below) but in
-            // function-references fsr it includes "of section or function"
-            || error.contains("type index out of bounds");
+            || error.contains("control frames remain at end of function");
     }
 
     // binary.wast includes a test in which a 0b (End) is eaten by a botched
@@ -769,34 +752,19 @@ fn error_matches(error: &str, message: &str) -> bool {
             || error.contains("unexpected end-of-file");
     }
 
-    if message == "zero flag expected" {
-        return error.contains("zero byte expected")
-            // wasmparser defers some of these errors to validation
-            || error.contains("trailing bytes at end of section");
-    }
-
-    if message == "junk after last section" {
-        return error.contains("section out of order");
-    }
-
     // Our error for these tests is happening as a parser error of
     // the text file, not a validation error of the binary.
     if message == "memory size must be at most 65536 pages (4GiB)" {
         return error.contains("invalid u32 number: constant out of range");
     }
 
     if message == "illegal opcode" {
-        // The test suite includes "bad opcodes" that later became valid opcodes
-        // (0xd4, function references proposal). However, they are still not
-        // constant expressions, so we can sidestep by checking for that error
-        // instead
-        return error.contains("constant expression required")
-            // The test suite contains a test with a global section where the
-            // init expression is truncated and doesn't have an "end"
-            // instruction. That's reported with wasmparser as end-of-file
-            // because the end of the section was reached while the spec
-            // interpreter says "illegal opcode".
-            || error.contains("unexpected end-of-file");
+        // The test suite contains a test with a global section where the
+        // init expression is truncated and doesn't have an "end"
+        // instruction. That's reported with wasmparser as end-of-file
+        // because the end of the section was reached while the spec
+        // interpreter says "illegal opcode".
+        return error.contains("unexpected end-of-file");
     }
     if message == "unknown global" {
         return error.contains("global.get of locally defined global");
@@ -806,10 +774,6 @@ fn error_matches(error: &str, message: &str) -> bool {
         return error.contains("global is immutable");
     }
 
-    if message == "sub type" {
-        return error.contains("subtype");
-    }
-
     if message.starts_with("unknown operator") {
         return error.starts_with("unknown operator") || error.starts_with("unexpected token");
     }