2 files changed, 43 insertions, 3 deletions
diff --git a/src/passes/NameManager.cpp b/src/passes/NameManager.cpp
index 73a09262b..34ea6adac 100644
--- a/src/passes/NameManager.cpp
+++ b/src/passes/NameManager.cpp
@@ -24,9 +24,6 @@ void NameManager::visitLoop(Loop* curr) {
   names.insert(curr->out);
   names.insert(curr->in);
 }
-void NameManager::visitLabel(Label* curr) {
-  names.insert(curr->name);
-}
 void NameManager::visitBreak(Break* curr) {
   names.insert(curr->name);
 }
diff --git a/src/passes/RemoveImports.cpp b/src/passes/RemoveImports.cpp
new file mode 100644
index 000000000..561002f57
--- /dev/null
+++ b/src/passes/RemoveImports.cpp
@@ -0,0 +1,43 @@
+//
+// Removeds imports, and replaces them with nops. This is useful
+// for running a module through the reference interpreter, which
+// does not validate imports for a JS environment (by removing
+// imports, we can at least get the reference interpreter to
+// look at all the rest of the code).
+//
+
+#include <wasm.h>
+#include <pass.h>
+
+namespace wasm {
+
+struct RemoveImports : public Pass {
+  MixedArena* allocator;
+  std::map<Name, Import*> importsMap;
+
+  void prepare(PassRunner* runner, Module *module) override {
+    allocator = runner->allocator;
+    importsMap = module->importsMap;
+  }
+
+  void visitCallImport(CallImport *curr) override {
+    WasmType type = importsMap[curr->target]->type.result;
+    if (type == none) {
+      replaceCurrent(allocator->alloc<Nop>());
+    } else {
+      Literal nopLiteral;
+      nopLiteral.type = type;
+      replaceCurrent(allocator->alloc<Const>()->set(nopLiteral));
+    }
+  }
+
+  void visitModule(Module *curr) override {
+    curr->importsMap.clear();
+    curr->imports.clear();
+  }
+};
+
+static RegisterPass<RemoveImports> registerPass("remove-imports", "removes imports and replaces them with nops");
+
+} // namespace wasm
+