T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix lightbeam build broken when supporting ModuleTranslateState (#445)

Browse Source
This commit is contained in:
Johnnie Birch
2019-10-22 16:18:54 -07:00
committed by Dan Gohman
parent 8c4cbf9a55
commit a3dd4b91e1
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wasmtime-environ/src/lightbeam.rs
View File

@@ -9,7 +9,7 @@ use crate::address_map::{ModuleAddressMap, ValueLabelsRanges};
use crate::cranelift::RelocSink; use crate::cranelift::RelocSink;
use cranelift_codegen::{ir, isa}; use cranelift_codegen::{ir, isa};
use cranelift_entity::{PrimaryMap, SecondaryMap}; use cranelift_entity::{PrimaryMap, SecondaryMap};
use cranelift_wasm::DefinedFuncIndex; use cranelift_wasm::{DefinedFuncIndex, ModuleTranslationState};
use lightbeam; use lightbeam;
/// A compiler that compiles a WebAssembly module with Lightbeam, directly translating the Wasm file. /// 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. /// associated relocations.
fn compile_module<'data, 'module>( fn compile_module<'data, 'module>(
module: &'module Module, module: &'module Module,
module_translation: &ModuleTranslationState, _module_translation: &ModuleTranslationState,
function_body_inputs: PrimaryMap<DefinedFuncIndex, FunctionBodyData<'data>>, function_body_inputs: PrimaryMap<DefinedFuncIndex, FunctionBodyData<'data>>,
isa: &dyn isa::TargetIsa, isa: &dyn isa::TargetIsa,
// TODO // TODO

1
wasmtime-jit/src/compiler.rs
View File

@@ -133,6 +133,7 @@ impl Compiler {
CompilationStrategy::Lightbeam => { CompilationStrategy::Lightbeam => {
wasmtime_environ::lightbeam::Lightbeam::compile_module( wasmtime_environ::lightbeam::Lightbeam::compile_module(
module, module,
module_translation,
function_body_inputs, function_body_inputs,
&*self.isa, &*self.isa,
debug_data.is_some(), debug_data.is_some(),