Merge branch 'master' into singlepass

# Conflicts:
#	lib/compiler-singlepass/src/codegen_x64.rs
#	lib/compiler-singlepass/src/common_decl.rs
#	lib/compiler-singlepass/src/emitter_x64.rs
#	lib/compiler-singlepass/src/lib.rs
#	lib/compiler-singlepass/src/machine.rs
#	lib/engine-jit/src/engine.rs
#	lib/engine-jit/src/serialize.rs
This commit is contained in:
Syrus
2020-05-18 15:14:44 -07:00
31 changed files with 917 additions and 435 deletions

View File

@ -118,7 +118,7 @@ impl Compiler for SinglepassCompiler {
Ok(Compilation::new(functions, import_trampolines))
}
fn compile_wasm_trampolines(
fn compile_function_call_trampolines(
&self,
signatures: &[FunctionType],
) -> Result<Vec<FunctionBody>, CompileError> {
@ -128,6 +128,14 @@ impl Compiler for SinglepassCompiler {
.map(gen_std_trampoline)
.collect())
}
fn compile_dynamic_function_trampolines(
&self,
module: &Module,
) -> Result<PrimaryMap<FunctionIndex, FunctionBody>, CompileError> {
Ok(PrimaryMap::new())
// unimplemented!("Dynamic funciton trampolines not yet implemented");
}
}
trait ToCompileError {