fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-22 13:11:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge #1262

Browse Source 
1262: Update to latest inkwell which adds context lifetime to basic blocks. r=nlewycky a=nlewycky

The latest inkwell adds lifetimes to basic blocks and also changes most APIs to pass them without reference.

Co-authored-by: Nick Lewycky <nick@wasmer.io>
This commit is contained in:
bors[bot]
2020-03-06 22:51:22 +00:00
committed by GitHub
parent 4861e6ec5d 3e0d299227
commit b292292267
5 changed files with 76 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -659,7 +659,7 @@ dependencies = [
[[package]] [[package]]
name = "inkwell" name = "inkwell"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/TheDan64/inkwell?rev=0a864ebf68b33d4d514b67796264b03898aa0944#0a864ebf68b33d4d514b67796264b03898aa0944" source = "git+https://github.com/TheDan64/inkwell?rev=af4cf4efbb27cdea8a54175ffc18ffd91964618c#af4cf4efbb27cdea8a54175ffc18ffd91964618c"
dependencies = [ dependencies = [
"either", "either",
"inkwell_internals", "inkwell_internals",
@ -673,7 +673,7 @@ dependencies = [
[[package]] [[package]]
name = "inkwell_internals" name = "inkwell_internals"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/TheDan64/inkwell?rev=0a864ebf68b33d4d514b67796264b03898aa0944#0a864ebf68b33d4d514b67796264b03898aa0944" source = "git+https://github.com/TheDan64/inkwell?rev=af4cf4efbb27cdea8a54175ffc18ffd91964618c#af4cf4efbb27cdea8a54175ffc18ffd91964618c"
dependencies = [ dependencies = [
"proc-macro2 0.4.30", "proc-macro2 0.4.30",
"quote 0.6.13", "quote 0.6.13",

4
lib/llvm-backend/Cargo.toml
View File

@ -19,13 +19,13 @@ byteorder = "1"
[target.'cfg(target_arch = "x86_64")'.dependencies.inkwell] [target.'cfg(target_arch = "x86_64")'.dependencies.inkwell]
git = "https://github.com/TheDan64/inkwell" git = "https://github.com/TheDan64/inkwell"
rev = "0a864ebf68b33d4d514b67796264b03898aa0944" rev = "af4cf4efbb27cdea8a54175ffc18ffd91964618c"
default-features = false default-features = false
features = ["llvm8-0", "target-x86"] features = ["llvm8-0", "target-x86"]
[target.'cfg(target_arch = "aarch64")'.dependencies.inkwell] [target.'cfg(target_arch = "aarch64")'.dependencies.inkwell]
git = "https://github.com/TheDan64/inkwell" git = "https://github.com/TheDan64/inkwell"
rev = "0a864ebf68b33d4d514b67796264b03898aa0944" rev = "af4cf4efbb27cdea8a54175ffc18ffd91964618c"
default-features = false default-features = false
features = ["llvm8-0", "target-aarch64"] features = ["llvm8-0", "target-aarch64"]

114
lib/llvm-backend/src/code.rs
View File

@ -354,15 +354,15 @@ fn trap_if_not_representable_as_int<'ctx>(
let failure_block = context.append_basic_block(*function, "conversion_failure_block"); let failure_block = context.append_basic_block(*function, "conversion_failure_block");
let continue_block = context.append_basic_block(*function, "conversion_success_block"); let continue_block = context.append_basic_block(*function, "conversion_success_block");
builder.build_conditional_branch(out_of_bounds, &failure_block, &continue_block); builder.build_conditional_branch(out_of_bounds, failure_block, continue_block);
builder.position_at_end(&failure_block); builder.position_at_end(failure_block);
builder.build_call( builder.build_call(
intrinsics.throw_trap, intrinsics.throw_trap,
&[intrinsics.trap_illegal_arithmetic], &[intrinsics.trap_illegal_arithmetic],
"throw", "throw",
); );
builder.build_unreachable(); builder.build_unreachable();
builder.position_at_end(&continue_block); builder.position_at_end(continue_block);
} }
fn trap_if_zero_or_overflow<'ctx>( fn trap_if_zero_or_overflow<'ctx>(
@ -418,15 +418,15 @@ fn trap_if_zero_or_overflow<'ctx>(
let shouldnt_trap_block = context.append_basic_block(*function, "shouldnt_trap_block"); let shouldnt_trap_block = context.append_basic_block(*function, "shouldnt_trap_block");
let should_trap_block = context.append_basic_block(*function, "should_trap_block"); let should_trap_block = context.append_basic_block(*function, "should_trap_block");
builder.build_conditional_branch(should_trap, &should_trap_block, &shouldnt_trap_block); builder.build_conditional_branch(should_trap, should_trap_block, shouldnt_trap_block);
builder.position_at_end(&should_trap_block); builder.position_at_end(should_trap_block);
builder.build_call( builder.build_call(
intrinsics.throw_trap, intrinsics.throw_trap,
&[intrinsics.trap_illegal_arithmetic], &[intrinsics.trap_illegal_arithmetic],
"throw", "throw",
); );
builder.build_unreachable(); builder.build_unreachable();
builder.position_at_end(&shouldnt_trap_block); builder.position_at_end(shouldnt_trap_block);
} }
fn trap_if_zero<'ctx>( fn trap_if_zero<'ctx>(
@ -460,15 +460,15 @@ fn trap_if_zero<'ctx>(
let shouldnt_trap_block = context.append_basic_block(*function, "shouldnt_trap_block"); let shouldnt_trap_block = context.append_basic_block(*function, "shouldnt_trap_block");
let should_trap_block = context.append_basic_block(*function, "should_trap_block"); let should_trap_block = context.append_basic_block(*function, "should_trap_block");
builder.build_conditional_branch(should_trap, &should_trap_block, &shouldnt_trap_block); builder.build_conditional_branch(should_trap, should_trap_block, shouldnt_trap_block);
builder.position_at_end(&should_trap_block); builder.position_at_end(should_trap_block);
builder.build_call( builder.build_call(
intrinsics.throw_trap, intrinsics.throw_trap,
&[intrinsics.trap_illegal_arithmetic], &[intrinsics.trap_illegal_arithmetic],
"throw", "throw",
); );
builder.build_unreachable(); builder.build_unreachable();
builder.position_at_end(&shouldnt_trap_block); builder.position_at_end(shouldnt_trap_block);
} }
fn v128_into_int_vec<'ctx>( fn v128_into_int_vec<'ctx>(
@ -774,17 +774,17 @@ fn resolve_memory_ptr<'ctx>(
let not_in_bounds_block = context.append_basic_block(*function, "not_in_bounds_block"); let not_in_bounds_block = context.append_basic_block(*function, "not_in_bounds_block");
builder.build_conditional_branch( builder.build_conditional_branch(
ptr_in_bounds, ptr_in_bounds,
&in_bounds_continue_block, in_bounds_continue_block,
&not_in_bounds_block, not_in_bounds_block,
); );
builder.position_at_end(&not_in_bounds_block); builder.position_at_end(not_in_bounds_block);
builder.build_call( builder.build_call(
intrinsics.throw_trap, intrinsics.throw_trap,
&[intrinsics.trap_memory_oob], &[intrinsics.trap_memory_oob],
"throw", "throw",
); );
builder.build_unreachable(); builder.build_unreachable();
builder.position_at_end(&in_bounds_continue_block); builder.position_at_end(in_bounds_continue_block);
} }
} }
@ -918,9 +918,9 @@ fn trap_if_misaligned<'ctx>(
let continue_block = context.append_basic_block(*function, "aligned_access_continue_block"); let continue_block = context.append_basic_block(*function, "aligned_access_continue_block");
let not_aligned_block = context.append_basic_block(*function, "misaligned_trap_block"); let not_aligned_block = context.append_basic_block(*function, "misaligned_trap_block");
builder.build_conditional_branch(aligned, &continue_block, &not_aligned_block); builder.build_conditional_branch(aligned, continue_block, not_aligned_block);
builder.position_at_end(&not_aligned_block); builder.position_at_end(not_aligned_block);
builder.build_call( builder.build_call(
intrinsics.throw_trap, intrinsics.throw_trap,
&[intrinsics.trap_misaligned_atomic], &[intrinsics.trap_misaligned_atomic],
@ -928,7 +928,7 @@ fn trap_if_misaligned<'ctx>(
); );
builder.build_unreachable(); builder.build_unreachable();
builder.position_at_end(&continue_block); builder.position_at_end(continue_block);
} }
#[derive(Debug)] #[derive(Debug)]
@ -1053,11 +1053,11 @@ impl<'ctx> FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator<'ct
.builder .builder
.as_ref() .as_ref()
.unwrap() .unwrap()
.build_unconditional_branch(&start_of_code_block); .build_unconditional_branch(start_of_code_block);
self.builder self.builder
.as_ref() .as_ref()
.unwrap() .unwrap()
.position_at_end(&start_of_code_block); .position_at_end(start_of_code_block);
let cache_builder = self.context.as_ref().unwrap().create_builder(); let cache_builder = self.context.as_ref().unwrap().create_builder();
cache_builder.position_before(&entry_end_inst); cache_builder.position_before(&entry_end_inst);
@ -1210,7 +1210,7 @@ impl<'ctx> FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator<'ct
})?; })?;
let end_block = context.append_basic_block(function, "end"); let end_block = context.append_basic_block(function, "end");
builder.position_at_end(&end_block); builder.position_at_end(end_block);
let phis = if let Ok(wasmer_ty) = blocktype_to_type(ty) { let phis = if let Ok(wasmer_ty) = blocktype_to_type(ty) {
let llvm_ty = type_to_llvm(intrinsics, wasmer_ty); let llvm_ty = type_to_llvm(intrinsics, wasmer_ty);
@ -1223,15 +1223,15 @@ impl<'ctx> FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator<'ct
}; };
state.push_block(end_block, phis); state.push_block(end_block, phis);
builder.position_at_end(&current_block); builder.position_at_end(current_block);
} }
Operator::Loop { ty } => { Operator::Loop { ty } => {
let loop_body = context.append_basic_block(function, "loop_body"); let loop_body = context.append_basic_block(function, "loop_body");
let loop_next = context.append_basic_block(function, "loop_outer"); let loop_next = context.append_basic_block(function, "loop_outer");
builder.build_unconditional_branch(&loop_body); builder.build_unconditional_branch(loop_body);
builder.position_at_end(&loop_next); builder.position_at_end(loop_next);
let phis = if let Ok(wasmer_ty) = blocktype_to_type(ty) { let phis = if let Ok(wasmer_ty) = blocktype_to_type(ty) {
let llvm_ty = type_to_llvm(intrinsics, wasmer_ty); let llvm_ty = type_to_llvm(intrinsics, wasmer_ty);
[llvm_ty] [llvm_ty]
@ -1242,7 +1242,7 @@ impl<'ctx> FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator<'ct
SmallVec::new() SmallVec::new()
}; };
builder.position_at_end(&loop_body); builder.position_at_end(loop_body);
if self.track_state { if self.track_state {
if let Some(offset) = opcode_offset { if let Some(offset) = opcode_offset {
@ -1299,10 +1299,10 @@ impl<'ctx> FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator<'ct
// pop a value off the value stack and load it into // pop a value off the value stack and load it into
// the corresponding phi. // the corresponding phi.
for (phi, value) in frame.phis().iter().zip(values) { for (phi, value) in frame.phis().iter().zip(values) {
phi.add_incoming(&[(&value, &current_block)]); phi.add_incoming(&[(&value, current_block)]);
} }
builder.build_unconditional_branch(frame.br_dest()); builder.build_unconditional_branch(*frame.br_dest());
state.popn(value_len)?; state.popn(value_len)?;
state.reachable = false; state.reachable = false;
@ -1327,7 +1327,7 @@ impl<'ctx> FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator<'ct
}); });
for (phi, value) in frame.phis().iter().zip(param_stack) { for (phi, value) in frame.phis().iter().zip(param_stack) {
phi.add_incoming(&[(&value, &current_block)]); phi.add_incoming(&[(&value, current_block)]);
} }
let else_block = context.append_basic_block(function, "else"); let else_block = context.append_basic_block(function, "else");
@ -1338,8 +1338,8 @@ impl<'ctx> FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator<'ct
intrinsics.i32_zero, intrinsics.i32_zero,
&state.var_name(), &state.var_name(),
); );
builder.build_conditional_branch(cond_value, frame.br_dest(), &else_block); builder.build_conditional_branch(cond_value, *frame.br_dest(), else_block);
builder.position_at_end(&else_block); builder.position_at_end(else_block);
} }
Operator::BrTable { ref table } => { Operator::BrTable { ref table } => {
let current_block = builder.get_insert_block().ok_or(CodegenError { let current_block = builder.get_insert_block().ok_or(CodegenError {
@ -1360,7 +1360,7 @@ impl<'ctx> FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator<'ct
}; };
for (phi, value) in default_frame.phis().iter().zip(args.iter()) { for (phi, value) in default_frame.phis().iter().zip(args.iter()) {
phi.add_incoming(&[(value, &current_block)]); phi.add_incoming(&[(value, current_block)]);
} }
let cases: Vec<_> = label_depths let cases: Vec<_> = label_depths
@ -1377,14 +1377,14 @@ impl<'ctx> FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator<'ct
context.i32_type().const_int(case_index as u64, false); context.i32_type().const_int(case_index as u64, false);
for (phi, value) in frame.phis().iter().zip(args.iter()) { for (phi, value) in frame.phis().iter().zip(args.iter()) {
phi.add_incoming(&[(value, &current_block)]); phi.add_incoming(&[(value, current_block)]);
} }
Ok((case_index_literal, frame.br_dest())) Ok((case_index_literal, *frame.br_dest()))
}) })
.collect::<Result<_, _>>()?; .collect::<Result<_, _>>()?;
builder.build_switch(index.into_int_value(), default_frame.br_dest(), &cases[..]); builder.build_switch(index.into_int_value(), *default_frame.br_dest(), &cases[..]);
let args_len = args.len(); let args_len = args.len();
state.popn(args_len)?; state.popn(args_len)?;
@ -1399,7 +1399,7 @@ impl<'ctx> FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator<'ct
let end_block = context.append_basic_block(function, "if_end"); let end_block = context.append_basic_block(function, "if_end");
let end_phis = { let end_phis = {
builder.position_at_end(&end_block); builder.position_at_end(end_block);
let phis = if let Ok(wasmer_ty) = blocktype_to_type(ty) { let phis = if let Ok(wasmer_ty) = blocktype_to_type(ty) {
let llvm_ty = type_to_llvm(intrinsics, wasmer_ty); let llvm_ty = type_to_llvm(intrinsics, wasmer_ty);
@ -1411,7 +1411,7 @@ impl<'ctx> FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator<'ct
SmallVec::new() SmallVec::new()
}; };
builder.position_at_end(&current_block); builder.position_at_end(current_block);
phis phis
}; };
@ -1424,8 +1424,8 @@ impl<'ctx> FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator<'ct
&state.var_name(), &state.var_name(),
); );
builder.build_conditional_branch(cond_value, &if_then_block, &if_else_block); builder.build_conditional_branch(cond_value, if_then_block, if_else_block);
builder.position_at_end(&if_then_block); builder.position_at_end(if_then_block);
state.push_if(if_then_block, if_else_block, end_block, end_phis); state.push_if(if_then_block, if_else_block, end_block, end_phis);
} }
Operator::Else => { Operator::Else => {
@ -1439,10 +1439,10 @@ impl<'ctx> FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator<'ct
let (value, info) = state.pop1_extra()?; let (value, info) = state.pop1_extra()?;
let value = let value =
apply_pending_canonicalization(builder, intrinsics, value, info); apply_pending_canonicalization(builder, intrinsics, value, info);
phi.add_incoming(&[(&value, &current_block)]) phi.add_incoming(&[(&value, current_block)])
} }
let frame = state.frame_at_depth(0)?; let frame = state.frame_at_depth(0)?;
builder.build_unconditional_branch(frame.code_after()); builder.build_unconditional_branch(*frame.code_after());
} }
let (if_else_block, if_else_state) = if let ControlFrame::IfElse { let (if_else_block, if_else_state) = if let ControlFrame::IfElse {
@ -1458,7 +1458,7 @@ impl<'ctx> FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator<'ct
*if_else_state = IfElseState::Else; *if_else_state = IfElseState::Else;
builder.position_at_end(if_else_block); builder.position_at_end(*if_else_block);
state.reachable = true; state.reachable = true;
} }
@ -1473,10 +1473,10 @@ impl<'ctx> FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator<'ct
let (value, info) = state.pop1_extra()?; let (value, info) = state.pop1_extra()?;
let value = let value =
apply_pending_canonicalization(builder, intrinsics, value, info); apply_pending_canonicalization(builder, intrinsics, value, info);
phi.add_incoming(&[(&value, &current_block)]); phi.add_incoming(&[(&value, current_block)]);
} }
builder.build_unconditional_branch(frame.code_after()); builder.build_unconditional_branch(*frame.code_after());
} }
if let ControlFrame::IfElse { if let ControlFrame::IfElse {
@ -1487,12 +1487,12 @@ impl<'ctx> FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator<'ct
} = &frame } = &frame
{ {
if let IfElseState::If = if_else_state { if let IfElseState::If = if_else_state {
builder.position_at_end(if_else); builder.position_at_end(*if_else);
builder.build_unconditional_branch(next); builder.build_unconditional_branch(*next);
} }
} }
builder.position_at_end(frame.code_after()); builder.position_at_end(*frame.code_after());
state.reset_stack(&frame); state.reset_stack(&frame);
state.reachable = true; state.reachable = true;
@ -1530,11 +1530,11 @@ impl<'ctx> FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator<'ct
for phi in frame.phis().to_vec().iter() { for phi in frame.phis().to_vec().iter() {
let (arg, info) = state.pop1_extra()?; let (arg, info) = state.pop1_extra()?;
let arg = apply_pending_canonicalization(builder, intrinsics, arg, info); let arg = apply_pending_canonicalization(builder, intrinsics, arg, info);
phi.add_incoming(&[(&arg, &current_block)]); phi.add_incoming(&[(&arg, current_block)]);
} }
let frame = state.outermost_frame()?; let frame = state.outermost_frame()?;
builder.build_unconditional_branch(frame.br_dest()); builder.build_unconditional_branch(*frame.br_dest());
state.reachable = false; state.reachable = false;
} }
@ -2073,17 +2073,17 @@ impl<'ctx> FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator<'ct
context.append_basic_block(function, "not_in_bounds_block"); context.append_basic_block(function, "not_in_bounds_block");
builder.build_conditional_branch( builder.build_conditional_branch(
index_in_bounds, index_in_bounds,
&in_bounds_continue_block, in_bounds_continue_block,
&not_in_bounds_block, not_in_bounds_block,
); );
builder.position_at_end(&not_in_bounds_block); builder.position_at_end(not_in_bounds_block);
builder.build_call( builder.build_call(
intrinsics.throw_trap, intrinsics.throw_trap,
&[intrinsics.trap_call_indirect_oob], &[intrinsics.trap_call_indirect_oob],
"throw", "throw",
); );
builder.build_unreachable(); builder.build_unreachable();
builder.position_at_end(&in_bounds_continue_block); builder.position_at_end(in_bounds_continue_block);
// Next, check if the signature id is correct. // Next, check if the signature id is correct.
@ -2114,18 +2114,18 @@ impl<'ctx> FunctionCodeGenerator<CodegenError> for LLVMFunctionCodeGenerator<'ct
context.append_basic_block(function, "sigindices_notequal_block"); context.append_basic_block(function, "sigindices_notequal_block");
builder.build_conditional_branch( builder.build_conditional_branch(
sigindices_equal, sigindices_equal,
&continue_block, continue_block,
&sigindices_notequal_block, sigindices_notequal_block,
); );
builder.position_at_end(&sigindices_notequal_block); builder.position_at_end(sigindices_notequal_block);
builder.build_call( builder.build_call(
intrinsics.throw_trap, intrinsics.throw_trap,
&[intrinsics.trap_call_indirect_sig], &[intrinsics.trap_call_indirect_sig],
"throw", "throw",
); );
builder.build_unreachable(); builder.build_unreachable();
builder.position_at_end(&continue_block); builder.position_at_end(continue_block);
let wasmer_fn_sig = &info.signatures[sig_index]; let wasmer_fn_sig = &info.signatures[sig_index];
let fn_ty = signatures[sig_index]; let fn_ty = signatures[sig_index];
@ -8763,10 +8763,10 @@ impl<'ctx> ModuleCodeGenerator<LLVMFunctionCodeGenerator<'ctx>, LLVMBackend, Cod
let mut state: State<'ctx> = State::new(); let mut state: State<'ctx> = State::new();
let entry_block = context.append_basic_block(*function, "entry"); let entry_block = context.append_basic_block(*function, "entry");
let alloca_builder = context.create_builder(); let alloca_builder = context.create_builder();
alloca_builder.position_at_end(&entry_block); alloca_builder.position_at_end(entry_block);
let return_block = context.append_basic_block(*function, "return"); let return_block = context.append_basic_block(*function, "return");
builder.position_at_end(&return_block); builder.position_at_end(return_block);
let phis: SmallVec<[PhiValue; 1]> = func_sig let phis: SmallVec<[PhiValue; 1]> = func_sig
.returns() .returns()
@ -8776,7 +8776,7 @@ impl<'ctx> ModuleCodeGenerator<LLVMFunctionCodeGenerator<'ctx>, LLVMBackend, Cod
.collect(); .collect();
state.push_block(return_block, phis); state.push_block(return_block, phis);
builder.position_at_end(&entry_block); builder.position_at_end(entry_block);
let mut locals = Vec::new(); let mut locals = Vec::new();
locals.extend( locals.extend(

28
lib/llvm-backend/src/state.rs
View File

@ -10,20 +10,20 @@ use std::ops::{BitAnd, BitOr, BitOrAssign};
#[derive(Debug)] #[derive(Debug)]
pub enum ControlFrame<'ctx> { pub enum ControlFrame<'ctx> {
Block { Block {
next: BasicBlock, next: BasicBlock<'ctx>,
phis: SmallVec<[PhiValue<'ctx>; 1]>, phis: SmallVec<[PhiValue<'ctx>; 1]>,
stack_size_snapshot: usize, stack_size_snapshot: usize,
}, },
Loop { Loop {
body: BasicBlock, body: BasicBlock<'ctx>,
next: BasicBlock, next: BasicBlock<'ctx>,
phis: SmallVec<[PhiValue<'ctx>; 1]>, phis: SmallVec<[PhiValue<'ctx>; 1]>,
stack_size_snapshot: usize, stack_size_snapshot: usize,
}, },
IfElse { IfElse {
if_then: BasicBlock, if_then: BasicBlock<'ctx>,
if_else: BasicBlock, if_else: BasicBlock<'ctx>,
next: BasicBlock, next: BasicBlock<'ctx>,
phis: SmallVec<[PhiValue<'ctx>; 1]>, phis: SmallVec<[PhiValue<'ctx>; 1]>,
stack_size_snapshot: usize, stack_size_snapshot: usize,
if_else_state: IfElseState, if_else_state: IfElseState,
@ -37,7 +37,7 @@ pub enum IfElseState {
} }
impl<'ctx> ControlFrame<'ctx> { impl<'ctx> ControlFrame<'ctx> {
pub fn code_after(&self) -> &BasicBlock { pub fn code_after(&self) -> &BasicBlock<'ctx> {
match self { match self {
ControlFrame::Block { ref next, .. } ControlFrame::Block { ref next, .. }
| ControlFrame::Loop { ref next, .. } | ControlFrame::Loop { ref next, .. }
@ -45,7 +45,7 @@ impl<'ctx> ControlFrame<'ctx> {
} }
} }
pub fn br_dest(&self) -> &BasicBlock { pub fn br_dest(&self) -> &BasicBlock<'ctx> {
match self { match self {
ControlFrame::Block { ref next, .. } | ControlFrame::IfElse { ref next, .. } => next, ControlFrame::Block { ref next, .. } | ControlFrame::IfElse { ref next, .. } => next,
ControlFrame::Loop { ref body, .. } => body, ControlFrame::Loop { ref body, .. } => body,
@ -367,7 +367,7 @@ impl<'ctx> State<'ctx> {
Ok(()) Ok(())
} }
pub fn push_block(&mut self, next: BasicBlock, phis: SmallVec<[PhiValue<'ctx>; 1]>) { pub fn push_block(&mut self, next: BasicBlock<'ctx>, phis: SmallVec<[PhiValue<'ctx>; 1]>) {
self.control_stack.push(ControlFrame::Block { self.control_stack.push(ControlFrame::Block {
next, next,
phis, phis,
@ -377,8 +377,8 @@ impl<'ctx> State<'ctx> {
pub fn push_loop( pub fn push_loop(
&mut self, &mut self,
body: BasicBlock, body: BasicBlock<'ctx>,
next: BasicBlock, next: BasicBlock<'ctx>,
phis: SmallVec<[PhiValue<'ctx>; 1]>, phis: SmallVec<[PhiValue<'ctx>; 1]>,
) { ) {
self.control_stack.push(ControlFrame::Loop { self.control_stack.push(ControlFrame::Loop {
@ -391,9 +391,9 @@ impl<'ctx> State<'ctx> {
pub fn push_if( pub fn push_if(
&mut self, &mut self,
if_then: BasicBlock, if_then: BasicBlock<'ctx>,
if_else: BasicBlock, if_else: BasicBlock<'ctx>,
next: BasicBlock, next: BasicBlock<'ctx>,
phis: SmallVec<[PhiValue<'ctx>; 1]>, phis: SmallVec<[PhiValue<'ctx>; 1]>,
) { ) {
self.control_stack.push(ControlFrame::IfElse { self.control_stack.push(ControlFrame::IfElse {

2
lib/llvm-backend/src/trampolines.rs
View File

@ -55,7 +55,7 @@ fn generate_trampoline<'ctx>(
intrinsics: &Intrinsics<'ctx>, intrinsics: &Intrinsics<'ctx>,
) -> Result<(), String> { ) -> Result<(), String> {
let entry_block = context.append_basic_block(trampoline_func, "entry"); let entry_block = context.append_basic_block(trampoline_func, "entry");
builder.position_at_end(&entry_block); builder.position_at_end(entry_block);
let (vmctx_ptr, func_ptr, args_ptr, returns_ptr) = match trampoline_func.get_params().as_slice() let (vmctx_ptr, func_ptr, args_ptr, returns_ptr) = match trampoline_func.get_params().as_slice()
{ {