From f0d1c31121d40d958fc94c9bbcaa1a5feacc923a Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Tue, 5 Jun 2018 11:39:25 -0700
Subject: Ensure import and function names match during fixInvokeFunctionNames
 (#1587)

We ran into an issue recently where wasm-emscripten-finalize
was being passed input without any debug names and this is not
currently supported.
---
 src/wasm/wasm-emscripten.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/wasm/wasm-emscripten.cpp b/src/wasm/wasm-emscripten.cpp
index 3b658c3ff..637711765 100644
--- a/src/wasm/wasm-emscripten.cpp
+++ b/src/wasm/wasm-emscripten.cpp
@@ -584,10 +584,14 @@ struct FixInvokeFunctionNamesWalker : public PostWalker<FixInvokeFunctionNamesWa
       return;
 
     FunctionType* func = wasm.getFunctionType(curr->functionType);
-    Name newname = fixEmEHSjLjNames(curr->name, getSig(func));
+    Name newname = fixEmEHSjLjNames(curr->base, getSig(func));
     if (newname == curr->name)
       return;
 
+    if (curr->base != curr->name) {
+      Fatal() << "Import name and function name do not match: '" << curr->base << "' '" << curr->name << "'";
+    }
+
     assert(importRenames.count(curr->name) == 0);
     importRenames[curr->name] = newname;
     // Either rename of remove the existing import
-- 
cgit v1.2.3