Fixup some rebase conflicts

bytecodealliance · Jul 31, 2020 · c0a7fc0 · c0a7fc0
1 parent be00995
commit c0a7fc0
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/environ/src/compilation.rs b/crates/environ/src/compilation.rs
@@ -2,8 +2,7 @@
 //! module.
 
 use crate::address_map::{ModuleAddressMap, ValueLabelsRanges};
-use crate::ModuleTranslation;
-use crate::{CacheConfig, FunctionBodyData, ModuleTranslation};
+use crate::{FunctionBodyData, ModuleTranslation};
 use cranelift_codegen::{binemit, ir, isa, isa::unwind::UnwindInfo};
 use cranelift_entity::PrimaryMap;
 use cranelift_wasm::{DefinedFuncIndex, FuncIndex, WasmError};

diff --git a/crates/environ/src/cranelift.rs b/crates/environ/src/cranelift.rs
@@ -294,7 +294,6 @@ impl Compiler for Cranelift {
         compile(
             isa,
             &translation.module.local,
-            translation.module_translation.as_ref().unwrap(),
             function_body_inputs,
             &translation.tunables,
         )
@@ -304,7 +303,6 @@ impl Compiler for Cranelift {
 fn compile(
     isa: &dyn isa::TargetIsa,
     local: &ModuleLocal,
-    module_translation: &ModuleTranslationState,
     function_body_inputs: PrimaryMap<DefinedFuncIndex, FunctionBodyData<'_>>,
     tunables: &Tunables,
 ) -> Result<CompileResult, CompileError> {
@@ -363,6 +361,7 @@ fn compile(
             readonly: false,
         });
         context.func.stack_limit = Some(stack_limit);
+        func_translator.translate_body(
             &mut input.validator,
             input.body.clone(),
             &mut context.func,

diff --git a/crates/jit/Cargo.toml b/crates/jit/Cargo.toml
@@ -25,7 +25,7 @@ wasmtime-obj = { path = "../obj", version = "0.19.0" }
 region = "2.1.0"
 thiserror = "1.0.4"
 target-lexicon = { version = "0.10.0", default-features = false }
-wasmparser = "0.60.0"
+wasmparser = "0.60.2"
 more-asserts = "0.2.1"
 anyhow = "1.0"
 cfg-if = "0.1.9"

diff --git a/crates/jit/src/compiler.rs b/crates/jit/src/compiler.rs
@@ -214,12 +214,14 @@ impl Hash for Compiler {
             strategy,
             isa,
             tunables,
+            features,
         } = self;
 
         // Hash compiler's flags: compilation strategy, isa, frontend config,
         // misc tunables.
         strategy.hash(hasher);
         isa.triple().hash(hasher);
+        features.hash(hasher);
         // TODO: if this `to_string()` is too expensive then we should upstream
         // a native hashing ability of flags into cranelift itself, but
         // compilation and/or cache loading is relatively expensive so seems