From a5919e92af2e1ef9172d541f1b30d143d5f96e56 Mon Sep 17 00:00:00 2001
From: Ben Smith <binjimin@gmail.com>
Date: Wed, 3 Apr 2019 11:36:14 -0700
Subject: Update testsuite; fix linking spec test (#1055)

When a module is instantiated, and the start function traps, the
contents of the memory and the table may have been modified. This case
is handled by the `assert_uninstantiable` check in a wast test.

In spectest-interp, assert_uninstantiable would instantiate the module,
but was incorrectly resetting the environment. In run-spec-wasm2c, the
`assert_uninstantiable` tests weren't being run at all. Now the module's
`init` function is run, and it is expected to trap.
---
 src/tools/spectest-interp.cc |  5 +++--
 test/run-spec-wasm2c.py      | 14 ++++++++++++--
 test/spec/linking.txt        |  2 +-
 test/wasm2c/spec/linking.txt |  2 +-
 test/wasm2c/spec/start.txt   |  2 +-
 third_party/testsuite        |  2 +-
 6 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/tools/spectest-interp.cc b/src/tools/spectest-interp.cc
index c0be53d6..ce8421a1 100644
--- a/src/tools/spectest-interp.cc
+++ b/src/tools/spectest-interp.cc
@@ -1171,7 +1171,6 @@ wabt::Result CommandRunner::OnAssertUninstantiableCommand(
     const AssertUninstantiableCommand* command) {
   Errors errors;
   DefinedModule* module;
-  Environment::MarkPoint mark = env_.Mark();
   wabt::Result result = ReadModule(command->filename, &env_, &errors, &module);
   FormatErrorsToFile(errors, Location::Type::Binary);
 
@@ -1190,7 +1189,9 @@ wabt::Result CommandRunner::OnAssertUninstantiableCommand(
     result = wabt::Result::Error;
   }
 
-  env_.ResetToMarkPoint(mark);
+  // Don't reset env_ here; if the start function fails, the environment is
+  // still modified. For example, a table may have been populated with a
+  // function from this module.
   return result;
 }
 
diff --git a/test/run-spec-wasm2c.py b/test/run-spec-wasm2c.py
index baf08a72..741722f9 100755
--- a/test/run-spec-wasm2c.py
+++ b/test/run-spec-wasm2c.py
@@ -104,6 +104,11 @@ def MangleName(s):
   return result
 
 
+def IsModuleCommand(command):
+  return (command['type'] == 'module' or
+          command['type'] == 'assert_uninstantiable')
+
+
 class CWriter(object):
 
   def __init__(self, spec_json, prefix, out_file, out_dir):
@@ -127,7 +132,7 @@ class CWriter(object):
     self.out_file.write("\n}\n")
 
   def GetModuleFilenames(self):
-    return [c['filename'] for c in self.commands if c['type'] == 'module']
+    return [c['filename'] for c in self.commands if IsModuleCommand(c)]
 
   def GetModulePrefix(self, idx_or_name=None):
     if idx_or_name is not None:
@@ -137,7 +142,7 @@ class CWriter(object):
   def _CacheModulePrefixes(self):
     idx = 0
     for command in self.commands:
-      if command['type'] == 'module':
+      if IsModuleCommand(command):
         name = os.path.basename(command['filename'])
         name = os.path.splitext(name)[0]
         name = re.sub(r'[^a-zA-Z0-9_]', '_', name)
@@ -186,6 +191,7 @@ class CWriter(object):
   def _WriteCommand(self, command):
     command_funcs = {
         'module': self._WriteModuleCommand,
+        'assert_uninstantiable': self._WriteAssertUninstantiableCommand,
         'action': self._WriteActionCommand,
         'assert_return': self._WriteAssertReturnCommand,
         'assert_return_canonical_nan': self._WriteAssertReturnNanCommand,
@@ -204,6 +210,10 @@ class CWriter(object):
     self.module_idx += 1
     self.out_file.write('%sinit();\n' % self.GetModulePrefix())
 
+  def _WriteAssertUninstantiableCommand(self, command):
+    self.module_idx += 1
+    self.out_file.write('ASSERT_TRAP(%sinit());\n' % self.GetModulePrefix())
+
   def _WriteActionCommand(self, command):
     self.out_file.write('%s;\n' % self._Action(command))
 
diff --git a/test/spec/linking.txt b/test/spec/linking.txt
index 5a1e87e6..442c59ec 100644
--- a/test/spec/linking.txt
+++ b/test/spec/linking.txt
@@ -37,5 +37,5 @@ out/test/spec/linking.wast:335: assert_unlinkable passed:
 out/test/spec/linking.wast:345: assert_unlinkable passed:
   error: elem segment is out of bounds: [0, 1) >= max value 0
   000002d: error: OnElemSegmentFunctionIndexCount callback failed
-91/91 tests passed.
+94/94 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/wasm2c/spec/linking.txt b/test/wasm2c/spec/linking.txt
index 57c26103..6f9739e2 100644
--- a/test/wasm2c/spec/linking.txt
+++ b/test/wasm2c/spec/linking.txt
@@ -1,5 +1,5 @@
 ;;; TOOL: run-spec-wasm2c
 ;;; STDIN_FILE: third_party/testsuite/linking.wast
 (;; STDOUT ;;;
-79/79 tests passed.
+82/82 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/wasm2c/spec/start.txt b/test/wasm2c/spec/start.txt
index d3bb9590..7caafc65 100644
--- a/test/wasm2c/spec/start.txt
+++ b/test/wasm2c/spec/start.txt
@@ -4,5 +4,5 @@
 spectest.print_i32(1)
 spectest.print_i32(2)
 spectest.print()
-6/6 tests passed.
+7/7 tests passed.
 ;;; STDOUT ;;)
diff --git a/third_party/testsuite b/third_party/testsuite
index 8efdcbea..1e6b3836 160000
--- a/third_party/testsuite
+++ b/third_party/testsuite
@@ -1 +1 @@
-Subproject commit 8efdcbeaeba16493f1f360532754456a5a83bf3d
+Subproject commit 1e6b3836e97ddbb90f4520ff18411dcfabaf0354
-- 
cgit v1.2.3