From 84eb631330cbeb2afc80df2c2c856a2392dc66bb Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <aardappel@gmail.com>
Date: Mon, 22 Feb 2021 15:17:44 -0800
Subject: Fix global destructor ordering problem (#3592)

On Windows/VS the maps in this code caused a double-delete of a Literal.
Given that order of destruction is unspecified, I decided to make them locals, which fixed it.
Not sure if there is still a latent ordering bug, but not having these as globals seems an improvement regardless.
---
 src/tools/wasm-shell.cpp | 52 ++++++++++++++++++++++++++++++------------------
 1 file changed, 33 insertions(+), 19 deletions(-)

(limited to 'src/tools/wasm-shell.cpp')

diff --git a/src/tools/wasm-shell.cpp b/src/tools/wasm-shell.cpp
index b3b52d9a1..09aaa023e 100644
--- a/src/tools/wasm-shell.cpp
+++ b/src/tools/wasm-shell.cpp
@@ -42,13 +42,6 @@ Name ASSERT_UNLINKABLE("assert_unlinkable");
 Name INVOKE("invoke");
 Name GET("get");
 
-// Modules named in the file
-
-std::map<Name, std::unique_ptr<Module>> modules;
-std::map<Name, std::unique_ptr<SExpressionWasmBuilder>> builders;
-std::map<Name, std::unique_ptr<ShellExternalInterface>> interfaces;
-std::map<Name, std::unique_ptr<ModuleInstance>> instances;
-
 //
 // An operation on a module
 //
@@ -61,7 +54,8 @@ struct Operation {
 
   Operation(Element& element,
             ModuleInstance* instanceInit,
-            SExpressionWasmBuilder& builder)
+            SExpressionWasmBuilder& builder,
+            std::map<Name, std::unique_ptr<ModuleInstance>>& instances)
     : instance(instanceInit) {
     operation = element[0]->str();
     Index i = 1;
@@ -88,13 +82,16 @@ struct Operation {
   }
 };
 
-static void run_asserts(Name moduleName,
-                        size_t* i,
-                        bool* checked,
-                        Module* wasm,
-                        Element* root,
-                        SExpressionWasmBuilder* builder,
-                        Name entry) {
+static void
+run_asserts(Name moduleName,
+            size_t* i,
+            bool* checked,
+            Module* wasm,
+            Element* root,
+            SExpressionWasmBuilder* builder,
+            Name entry,
+            std::map<Name, std::unique_ptr<ShellExternalInterface>>& interfaces,
+            std::map<Name, std::unique_ptr<ModuleInstance>>& instances) {
   ModuleInstance* instance = nullptr;
   if (wasm) {
     // prefix make_unique to work around visual studio bugs
@@ -195,7 +192,7 @@ static void run_asserts(Name moduleName,
       }
     } else if (id == INVOKE) {
       assert(wasm);
-      Operation operation(curr, instance, *builder);
+      Operation operation(curr, instance, *builder, instances);
       operation.operate();
     } else if (wasm) { // if no wasm, we skipped the module
       // an invoke test
@@ -203,7 +200,7 @@ static void run_asserts(Name moduleName,
       WASM_UNUSED(trapped);
       Literals result;
       try {
-        Operation operation(*curr[1], instance, *builder);
+        Operation operation(*curr[1], instance, *builder, instances);
         result = operation.operate();
       } catch (const TrapException&) {
         trapped = true;
@@ -274,6 +271,13 @@ int main(int argc, const char* argv[]) {
 
   bool checked = false;
 
+  // Modules named in the file
+
+  std::map<Name, std::unique_ptr<Module>> modules;
+  std::map<Name, std::unique_ptr<SExpressionWasmBuilder>> builders;
+  std::map<Name, std::unique_ptr<ShellExternalInterface>> interfaces;
+  std::map<Name, std::unique_ptr<ModuleInstance>> instances;
+
   try {
     if (options.debug) {
       std::cerr << "parsing text to s-expressions...\n";
@@ -319,9 +323,19 @@ int main(int argc, const char* argv[]) {
                     modules[moduleName].get(),
                     &root,
                     builders[moduleName].get(),
-                    entry);
+                    entry,
+                    interfaces,
+                    instances);
       } else {
-        run_asserts(Name(), &i, &checked, nullptr, &root, nullptr, entry);
+        run_asserts(Name(),
+                    &i,
+                    &checked,
+                    nullptr,
+                    &root,
+                    nullptr,
+                    entry,
+                    interfaces,
+                    instances);
       }
     }
   } catch (ParseException& p) {
-- 
cgit v1.2.3