Merge pull request #695 from WebAssembly/opts

Get optimizer on par with emscripten asm.js optimizer

1 files changed, 3 insertions, 11 deletions

diff --git a/src/passes/RemoveImports.cpp b/src/passes/RemoveImports.cpp
index 19d6c3eb1..429203a2e 100644
--- a/src/passes/RemoveImports.cpp
+++ b/src/passes/RemoveImports.cpp
@@ -28,22 +28,14 @@
 namespace wasm {
 
 struct RemoveImports : public WalkerPass<PostWalker<RemoveImports, Visitor<RemoveImports>>> {
-  MixedArena* allocator;
-  Module* module;
-
-  void prepare(PassRunner* runner, Module *module_) override {
-    allocator = runner->allocator;
-    module = module_;
-  }
-
   void visitCallImport(CallImport *curr) {
-    WasmType type = module->getImport(curr->target)->functionType->result;
+    WasmType type = getModule()->getImport(curr->target)->functionType->result;
     if (type == none) {
-      replaceCurrent(allocator->alloc<Nop>());
+      replaceCurrent(getModule()->allocator.alloc<Nop>());
     } else {
       Literal nopLiteral;
       nopLiteral.type = type;
-      replaceCurrent(allocator->alloc<Const>()->set(nopLiteral));
+      replaceCurrent(getModule()->allocator.alloc<Const>()->set(nopLiteral));
     }
   }