mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-08-25 09:49:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

NFC. Pull this mapping into two mappings, I think it's nicer.

Browse Source
This commit is contained in:
Nick Lewycky
2020-06-01 19:56:23 -07:00
parent f39a38779b
commit 95c55ab40d
1 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/compiler-llvm/src/translator/code.rs
View File

@ -1528,10 +1528,8 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
let phis = blocktype_to_types(ty, self.wasm_module)
.iter()
.map(|&ty| {
self.builder
.build_phi(type_to_llvm(self.intrinsics, ty), "")
})
.map(|&wasm_ty| type_to_llvm(self.intrinsics, wasm_ty))
.map(|ty| self.builder.build_phi(ty, ""))
.collect();
self.state.push_block(end_block, phis);
@ -1547,20 +1545,16 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
self.builder.position_at_end(loop_next);
let phis = blocktype_to_types(ty, self.wasm_module)
.iter()
.map(|&ty| {
self.builder
.build_phi(type_to_llvm(self.intrinsics, ty), "")
})
.map(|&wasm_ty| type_to_llvm(self.intrinsics, wasm_ty))
.map(|ty| self.builder.build_phi(ty, ""))
.collect();
self.builder.position_at_end(loop_body);
let loop_phis: SmallVec<[PhiValue<'ctx>; 1]> =
blocktype_to_param_types(ty, self.wasm_module)
.iter()
.map(|&ty| {
self.builder
.build_phi(type_to_llvm(self.intrinsics, ty), "")
})
.map(|&wasm_ty| type_to_llvm(self.intrinsics, wasm_ty))
.map(|ty| self.builder.build_phi(ty, ""))
.collect();
for phi in loop_phis.iter().rev() {
let (value, info) = self.state.pop1_extra()?;
@ -1741,10 +1735,8 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
let phis = blocktype_to_types(ty, self.wasm_module)
.iter()
.map(|&ty| {
self.builder
.build_phi(type_to_llvm(self.intrinsics, ty), "")
})
.map(|&wasm_ty| type_to_llvm(self.intrinsics, wasm_ty))
.map(|ty| self.builder.build_phi(ty, ""))
.collect();
self.builder.position_at_end(current_block);
@ -1766,19 +1758,15 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
let else_phis: SmallVec<[PhiValue<'ctx>; 1]> =
blocktype_to_param_types(ty, self.wasm_module)
.iter()
.map(|&ty| {
self.builder
.build_phi(type_to_llvm(self.intrinsics, ty), "")
})
.map(|&wasm_ty| type_to_llvm(self.intrinsics, wasm_ty))
.map(|ty| self.builder.build_phi(ty, ""))
.collect();
self.builder.position_at_end(if_then_block);
let then_phis: SmallVec<[PhiValue<'ctx>; 1]> =
blocktype_to_param_types(ty, self.wasm_module)
.iter()
.map(|&ty| {
self.builder
.build_phi(type_to_llvm(self.intrinsics, ty), "")
})
.map(|&wasm_ty| type_to_llvm(self.intrinsics, wasm_ty))
.map(|ty| self.builder.build_phi(ty, ""))
.collect();
for (else_phi, then_phi) in else_phis.iter().rev().zip(then_phis.iter().rev()) {
let (value, info) = self.state.pop1_extra()?;