Cleanup shared constants (#1784)

7 files changed, 10 insertions, 12 deletions

diff --git a/src/asm2wasm.h b/src/asm2wasm.h
index d143239cc..dadb9bee3 100644
--- a/src/asm2wasm.h
+++ b/src/asm2wasm.h
@@ -130,6 +130,7 @@ Name I32_CTTZ("i32_cttz"),
      I64_ATOMICS_SUB("i64_atomics_sub"),
      I64_ATOMICS_EXCHANGE("i64_atomics_exchange"),
      I64_ATOMICS_COMPAREEXCHANGE("i64_atomics_compareExchange"),
+     TEMP_DOUBLE_PTR("tempDoublePtr"),
      EMSCRIPTEN_DEBUGINFO("emscripten_debuginfo");
 
 // Utilities
diff --git a/src/emscripten-optimizer/optimizer-shared.cpp b/src/emscripten-optimizer/optimizer-shared.cpp
index c990e2605..81f7949ba 100644
--- a/src/emscripten-optimizer/optimizer-shared.cpp
+++ b/src/emscripten-optimizer/optimizer-shared.cpp
@@ -27,7 +27,8 @@ IString SIMD_INT8X16_CHECK("SIMD_Int8x16_check"),
         SIMD_INT16X8_CHECK("SIMD_Int16x8_check"),
         SIMD_INT32X4_CHECK("SIMD_Int32x4_check"),
         SIMD_FLOAT32X4_CHECK("SIMD_Float32x4_check"),
-        SIMD_FLOAT64X2_CHECK("SIMD_Float64x2_check");
+        SIMD_FLOAT64X2_CHECK("SIMD_Float64x2_check"),
+        TEMP_RET0("tempRet0");
 
 int parseInt(const char *str) {
   int ret = *str - '0';
diff --git a/src/emscripten-optimizer/parser.cpp b/src/emscripten-optimizer/parser.cpp
index eb4abf6b3..035817090 100644
--- a/src/emscripten-optimizer/parser.cpp
+++ b/src/emscripten-optimizer/parser.cpp
@@ -44,8 +44,6 @@ IString TOPLEVEL("toplevel"),
         TRY("try"),
         INF("inf"),
         NaN("nan"),
-        TEMP_RET0("tempRet0"),
-        GET_TEMP_RET0("getTempRet0"),
         LLVM_CTTZ_I32("_llvm_cttz_i32"),
         UDIVMODDI4("___udivmoddi4"),
         UNARY_PREFIX("unary-prefix"),
@@ -78,7 +76,6 @@ IString TOPLEVEL("toplevel"),
         RSHIFT(">>"),
         LSHIFT("<<"),
         TRSHIFT(">>>"),
-        TEMP_DOUBLE_PTR("tempDoublePtr"),
         HEAP8("HEAP8"),
         HEAP16("HEAP16"),
         HEAP32("HEAP32"),
diff --git a/src/emscripten-optimizer/parser.h b/src/emscripten-optimizer/parser.h
index 1c12bf944..ae3c6b067 100644
--- a/src/emscripten-optimizer/parser.h
+++ b/src/emscripten-optimizer/parser.h
@@ -59,8 +59,6 @@ extern IString TOPLEVEL,
                TRY,
                INF,
                NaN,
-               TEMP_RET0,
-               GET_TEMP_RET0,
                LLVM_CTTZ_I32,
                UDIVMODDI4,
                UNARY_PREFIX,
@@ -93,7 +91,6 @@ extern IString TOPLEVEL,
                RSHIFT,
                LSHIFT,
                TRSHIFT,
-               TEMP_DOUBLE_PTR,
                HEAP8,
                HEAP16,
                HEAP32,
diff --git a/src/passes/LegalizeJSInterface.cpp b/src/passes/LegalizeJSInterface.cpp
index 96aed9636..b8d16894b 100644
--- a/src/passes/LegalizeJSInterface.cpp
+++ b/src/passes/LegalizeJSInterface.cpp
@@ -29,6 +29,7 @@
 #include "wasm.h"
 #include "pass.h"
 #include "asm_v_wasm.h"
+#include "shared-constants.h"
 #include "asmjs/shared-constants.h"
 #include "wasm-builder.h"
 #include "ir/function-type-utils.h"
@@ -38,9 +39,6 @@
 
 namespace wasm {
 
-Name GET_TEMP_RET_0("getTempRet0");
-Name SET_TEMP_RET_0("setTempRet0");
-
 struct LegalizeJSInterface : public Pass {
   void run(PassRunner* runner, Module* module) override {
     // for each illegal export, we must export a legalized stub instead
@@ -146,7 +144,7 @@ private:
     }
 
     if (func->result == i64) {
-      Function* f = getFunctionOrImport(module, SET_TEMP_RET_0, "vi");
+      Function* f = getFunctionOrImport(module, SET_TEMP_RET0, "vi");
       legal->result = i32;
       auto index = builder.addVar(legal, Name(), i64);
       auto* block = builder.makeBlock();
@@ -205,7 +203,7 @@ private:
     }
 
     if (imFunctionType->result == i64) {
-      Function* f = getFunctionOrImport(module, GET_TEMP_RET_0, "i");
+      Function* f = getFunctionOrImport(module, GET_TEMP_RET0, "i");
       call->type = i32;
       Expression* get = builder.makeCall(f->name, {}, call->type);
       func->body = I64Utilities::recreateI64(builder, call, get);
diff --git a/src/shared-constants.h b/src/shared-constants.h
index e8f98edb7..55d90b057 100644
--- a/src/shared-constants.h
+++ b/src/shared-constants.h
@@ -24,6 +24,8 @@ namespace wasm {
 extern Name GROW_WASM_MEMORY,
             MEMORY_BASE,
             TABLE_BASE,
+            GET_TEMP_RET0,
+            SET_TEMP_RET0,
             NEW_SIZE,
             MODULE,
             START,
diff --git a/src/wasm/wasm.cpp b/src/wasm/wasm.cpp
index 1554ded62..3373a3f20 100644
--- a/src/wasm/wasm.cpp
+++ b/src/wasm/wasm.cpp
@@ -37,6 +37,8 @@ const char* Dylink = "dylink";
 Name GROW_WASM_MEMORY("__growWasmMemory"),
      MEMORY_BASE("__memory_base"),
      TABLE_BASE("__table_base"),
+     GET_TEMP_RET0("getTempRet0"),
+     SET_TEMP_RET0("setTempRet0"),
      NEW_SIZE("newSize"),
      MODULE("module"),
      START("start"),