mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-08 21:58:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into singlepass

Browse Source 
# Conflicts:
#	Cargo.lock
This commit is contained in:
Syrus
2020-05-04 20:40:44 -07:00
parent 01ed7d115c 67e419ce57
commit 2240ccc622
27 changed files with 582 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/compiler-singlepass/src/codegen_x64.rs
View File

@@ -18,9 +18,8 @@ use wasmer_compiler::wasmparser::{
MemoryImmediate, Operator, Type as WpType, TypeOrFuncType as WpTypeOrFuncType,
};
use wasmer_compiler::{
CodeOffset, CompiledFunction, CompiledFunctionUnwindInfo, CustomSection,
CustomSectionProtection, FunctionBody, Relocation, RelocationKind, RelocationTarget,
SectionBody, SectionIndex,
CodeOffset, CompiledFunction, CustomSection, CustomSectionProtection, FunctionBody, Relocation,
RelocationKind, RelocationTarget, SectionBody, SectionIndex,
};
use wasmer_runtime::{MemoryPlan, MemoryStyle, Module, TablePlan, TableStyle, TrapCode};
@@ -8102,7 +8101,7 @@ impl<'a> FuncGen<'a> {
CompiledFunction {
body: FunctionBody {
body: self.assembler.finalize().unwrap().to_vec(),
unwind_info: CompiledFunctionUnwindInfo::None,
unwind_info: None,
},
relocations: self.relocations,
jt_offsets: SecondaryMap::new(),
@@ -8286,7 +8285,7 @@ pub fn gen_std_trampoline(sig: FunctionType) -> FunctionBody {
FunctionBody {
body: a.finalize().unwrap().to_vec(),
unwind_info: CompiledFunctionUnwindInfo::None,
unwind_info: None,
}
}