From a3dd4b91e1986d419a97ff708cb34f46a2e502b5 Mon Sep 17 00:00:00 2001 From: Johnnie Birch <45402135+jlb6740@users.noreply.github.com> Date: Tue, 22 Oct 2019 16:18:54 -0700 Subject: [PATCH] Fix lightbeam build broken when supporting ModuleTranslateState (#445) --- wasmtime-environ/src/lightbeam.rs | 4 ++-- wasmtime-jit/src/compiler.rs | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/wasmtime-environ/src/lightbeam.rs b/wasmtime-environ/src/lightbeam.rs index 07a690b1b7..4407d0b35f 100644 --- a/wasmtime-environ/src/lightbeam.rs +++ b/wasmtime-environ/src/lightbeam.rs @@ -9,7 +9,7 @@ use crate::address_map::{ModuleAddressMap, ValueLabelsRanges}; use crate::cranelift::RelocSink; use cranelift_codegen::{ir, isa}; use cranelift_entity::{PrimaryMap, SecondaryMap}; -use cranelift_wasm::DefinedFuncIndex; +use cranelift_wasm::{DefinedFuncIndex, ModuleTranslationState}; use lightbeam; /// A compiler that compiles a WebAssembly module with Lightbeam, directly translating the Wasm file. @@ -20,7 +20,7 @@ impl crate::compilation::Compiler for Lightbeam { /// associated relocations. fn compile_module<'data, 'module>( module: &'module Module, - module_translation: &ModuleTranslationState, + _module_translation: &ModuleTranslationState, function_body_inputs: PrimaryMap>, isa: &dyn isa::TargetIsa, // TODO diff --git a/wasmtime-jit/src/compiler.rs b/wasmtime-jit/src/compiler.rs index df19ee5075..a54b640d84 100644 --- a/wasmtime-jit/src/compiler.rs +++ b/wasmtime-jit/src/compiler.rs @@ -133,6 +133,7 @@ impl Compiler { CompilationStrategy::Lightbeam => { wasmtime_environ::lightbeam::Lightbeam::compile_module( module, + module_translation, function_body_inputs, &*self.isa, debug_data.is_some(),