Fuzzer: Allow using initial content with V8

scripts/fuzz_opt.py

@@ -311,6 +311,8 @@ def is_git_repo():
     'exception-handling.wast',
     'translate-eh-old-to-new.wast',
     'rse-eh.wast',
+    # Non-UTF8 strings trap in V8
+    'string-lowering.wast',
 ]
 
 
@@ -752,10 +754,7 @@ def run(self, wasm, extra_d8_flags=[]):
                 return run_vm([shared.V8, FUZZ_SHELL_JS] + shared.V8_OPTS + extra_d8_flags + ['--', wasm])
 
             def can_run(self, wasm):
-                # INITIAL_CONTENT is disallowed because some initial spec testcases
-                # have names that require mangling, see
-                # https://github.com/WebAssembly/binaryen/pull/3216
-                return not INITIAL_CONTENTS
+                return True
 
             def can_compare_to_self(self):
                 # With nans, VM differences can confuse us, so only very simple VMs

scripts/fuzz_shell.js

@@ -47,7 +47,10 @@ function printed(x, y) {
     // JS has just one null. Print that out rather than typeof null which is
     // 'object', below.
     return 'null';
-  } else if (typeof x !== 'number' && typeof x !== 'string') {
+  } else if (typeof x === 'string') {
+    // Emit a string in the same format as the binaryen interpreter.
+    return 'string("' + x + '")';
+  } else if (typeof x !== 'number') {
     // Something that is not a number or string, like a reference. We can't
     // print a reference because it could look different after opts - imagine
     // that a function gets renamed internally (that is, the problem is that

scripts/test/shared.py

@@ -260,6 +260,7 @@ def has_shell_timeout():
     '--experimental-wasm-typed-funcref',
     '--experimental-wasm-memory64',
     '--experimental-wasm-extended-const',
+    '--experimental-wasm-stringref',
     '--wasm-final-types',
 ]
 

src/tools/execution-results.h

@@ -115,7 +115,7 @@ struct ExecutionResults {
           // ignore the result if we hit an unreachable and returned no value
           if (values->size() > 0) {
             std::cout << "[fuzz-exec] note result: " << exp->name << " => ";
-            auto resultType = func->getResults();
+            auto resultType = values->getType();
             if (resultType.isRef() && !resultType.isString()) {
               // Don't print reference values, as funcref(N) contains an index
               // for example, which is not guaranteed to remain identical after

src/tools/fuzzing/fuzzing.cpp

@@ -433,6 +433,15 @@ void TranslateToFuzzReader::setupGlobals() {
 }
 
 void TranslateToFuzzReader::setupTags() {
+  // As in modifyInitialFunctions(), we can't allow tag imports as it would trap
+  // when the fuzzing infrastructure doesn't know what to provide.
+  for (auto& tag : wasm.tags) {
+    if (tag->imported()) {
+      tag->module = tag->base = Name();
+    }
+  }
+
+  // Add some random tags.
   Index num = upTo(3);
   for (size_t i = 0; i < num; i++) {
     addTag();