From 07c8975304524dba8c6c6e790f61bc4a9b9bade2 Mon Sep 17 00:00:00 2001 From: Lachlan Sneff Date: Fri, 22 Feb 2019 16:20:26 -0800 Subject: [PATCH] Fix clif backend --- lib/clif-backend/src/lib.rs | 2 +- lib/clif-backend/src/module.rs | 4 ++-- lib/clif-backend/src/module_env.rs | 1 - lib/clif-backend/src/resolver.rs | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/clif-backend/src/lib.rs b/lib/clif-backend/src/lib.rs index df2e4e208..967cdd5ed 100644 --- a/lib/clif-backend/src/lib.rs +++ b/lib/clif-backend/src/lib.rs @@ -43,7 +43,7 @@ impl Compiler for CraneliftCompiler { let isa = get_isa(); - let mut module = module::Module::new(wasm); + let mut module = module::Module::new(); let module_env = module_env::ModuleEnv::new(&mut module, &*isa); let func_bodies = module_env.translate(wasm)?; diff --git a/lib/clif-backend/src/module.rs b/lib/clif-backend/src/module.rs index 38a657625..9e934ee0a 100644 --- a/lib/clif-backend/src/module.rs +++ b/lib/clif-backend/src/module.rs @@ -7,7 +7,7 @@ use cranelift_wasm; use hashbrown::HashMap; use std::sync::Arc; -use wasmer_runtime_core::cache::{Artifact, Error as CacheError, WasmHash}; +use wasmer_runtime_core::cache::{Artifact, Error as CacheError}; use wasmer_runtime_core::{ backend::Backend, @@ -25,7 +25,7 @@ pub struct Module { } impl Module { - pub fn new(wasm: &[u8]) -> Self { + pub fn new() -> Self { Self { info: ModuleInfo { memories: Map::new(), diff --git a/lib/clif-backend/src/module_env.rs b/lib/clif-backend/src/module_env.rs index 643679a5f..7c6cd6731 100644 --- a/lib/clif-backend/src/module_env.rs +++ b/lib/clif-backend/src/module_env.rs @@ -4,7 +4,6 @@ use crate::{ }; use cranelift_codegen::{ir, isa}; use cranelift_wasm::{self, translate_module, FuncTranslator, ModuleEnvironment}; -use std::sync::Arc; use wasmer_runtime_core::{ error::{CompileError, CompileResult}, module::{ diff --git a/lib/clif-backend/src/resolver.rs b/lib/clif-backend/src/resolver.rs index 05af6e3d0..3095e8882 100644 --- a/lib/clif-backend/src/resolver.rs +++ b/lib/clif-backend/src/resolver.rs @@ -202,7 +202,7 @@ impl FuncResolverBuilder { pub fn finalize( mut self, - signatures: &SliceMap>, + signatures: &SliceMap, trampolines: Arc, handler_data: HandlerData, ) -> CompileResult<(FuncResolver, BackendCache)> {