pr 36
This commit is contained in:
@@ -221,26 +221,32 @@ pub fn lower_function(
|
||||
slots: *slots
|
||||
}, None));
|
||||
}
|
||||
ir_core::Instr::BeginPeek { .. } => {
|
||||
stack_types.pop(); // Pops gate
|
||||
ir_core::Instr::BeginPeek { gate } => {
|
||||
vm_func.body.push(ir_vm::Instruction::new(ir_vm::InstrKind::LocalLoad { slot: gate.0 }, None));
|
||||
vm_func.body.push(ir_vm::Instruction::new(ir_vm::InstrKind::GateRetain, None));
|
||||
vm_func.body.push(ir_vm::Instruction::new(ir_vm::InstrKind::GateBeginPeek, None));
|
||||
}
|
||||
ir_core::Instr::BeginBorrow { .. } => {
|
||||
stack_types.pop(); // Pops gate
|
||||
ir_core::Instr::BeginBorrow { gate } => {
|
||||
vm_func.body.push(ir_vm::Instruction::new(ir_vm::InstrKind::LocalLoad { slot: gate.0 }, None));
|
||||
vm_func.body.push(ir_vm::Instruction::new(ir_vm::InstrKind::GateRetain, None));
|
||||
vm_func.body.push(ir_vm::Instruction::new(ir_vm::InstrKind::GateBeginBorrow, None));
|
||||
}
|
||||
ir_core::Instr::BeginMutate { .. } => {
|
||||
stack_types.pop(); // Pops gate
|
||||
ir_core::Instr::BeginMutate { gate } => {
|
||||
vm_func.body.push(ir_vm::Instruction::new(ir_vm::InstrKind::LocalLoad { slot: gate.0 }, None));
|
||||
vm_func.body.push(ir_vm::Instruction::new(ir_vm::InstrKind::GateRetain, None));
|
||||
vm_func.body.push(ir_vm::Instruction::new(ir_vm::InstrKind::GateBeginMutate, None));
|
||||
}
|
||||
ir_core::Instr::EndPeek => {
|
||||
vm_func.body.push(ir_vm::Instruction::new(ir_vm::InstrKind::GateEndPeek, None));
|
||||
vm_func.body.push(ir_vm::Instruction::new(ir_vm::InstrKind::GateRelease, None));
|
||||
}
|
||||
ir_core::Instr::EndBorrow => {
|
||||
vm_func.body.push(ir_vm::Instruction::new(ir_vm::InstrKind::GateEndBorrow, None));
|
||||
vm_func.body.push(ir_vm::Instruction::new(ir_vm::InstrKind::GateRelease, None));
|
||||
}
|
||||
ir_core::Instr::EndMutate => {
|
||||
vm_func.body.push(ir_vm::Instruction::new(ir_vm::InstrKind::GateEndMutate, None));
|
||||
vm_func.body.push(ir_vm::Instruction::new(ir_vm::InstrKind::GateRelease, None));
|
||||
}
|
||||
ir_core::Instr::GateLoadField { gate, field } => {
|
||||
let offset = program.field_offsets.get(field)
|
||||
@@ -250,6 +256,7 @@ pub fn lower_function(
|
||||
stack_types.push(field_ty.clone());
|
||||
|
||||
vm_func.body.push(ir_vm::Instruction::new(ir_vm::InstrKind::LocalLoad { slot: gate.0 }, None));
|
||||
vm_func.body.push(ir_vm::Instruction::new(ir_vm::InstrKind::GateRetain, None));
|
||||
vm_func.body.push(ir_vm::Instruction::new(ir_vm::InstrKind::GateLoad { offset: *offset }, None));
|
||||
|
||||
if is_gate_type(&field_ty) {
|
||||
@@ -265,11 +272,13 @@ pub fn lower_function(
|
||||
// 1. Release old value in HIP if it was a gate
|
||||
if is_gate_type(&field_ty) {
|
||||
vm_func.body.push(ir_vm::Instruction::new(ir_vm::InstrKind::LocalLoad { slot: gate.0 }, None));
|
||||
vm_func.body.push(ir_vm::Instruction::new(ir_vm::InstrKind::GateRetain, None));
|
||||
vm_func.body.push(ir_vm::Instruction::new(ir_vm::InstrKind::GateLoad { offset: *offset }, None));
|
||||
vm_func.body.push(ir_vm::Instruction::new(ir_vm::InstrKind::GateRelease, None));
|
||||
}
|
||||
|
||||
vm_func.body.push(ir_vm::Instruction::new(ir_vm::InstrKind::LocalLoad { slot: gate.0 }, None));
|
||||
vm_func.body.push(ir_vm::Instruction::new(ir_vm::InstrKind::GateRetain, None));
|
||||
vm_func.body.push(ir_vm::Instruction::new(ir_vm::InstrKind::LocalLoad { slot: value.0 }, None));
|
||||
|
||||
// 2. Retain new value if it's a gate
|
||||
@@ -491,16 +500,20 @@ mod tests {
|
||||
// GateStore 100 (offset)
|
||||
// Ret
|
||||
|
||||
assert_eq!(func.body.len(), 7);
|
||||
assert_eq!(func.body.len(), 9);
|
||||
match &func.body[1].kind {
|
||||
ir_vm::InstrKind::LocalLoad { slot } => assert_eq!(*slot, 0),
|
||||
_ => panic!("Expected LocalLoad 0"),
|
||||
}
|
||||
match &func.body[2].kind {
|
||||
ir_vm::InstrKind::GateRetain => (),
|
||||
_ => panic!("Expected GateRetain"),
|
||||
}
|
||||
match &func.body[3].kind {
|
||||
ir_vm::InstrKind::GateLoad { offset } => assert_eq!(*offset, 100),
|
||||
_ => panic!("Expected GateLoad 100"),
|
||||
}
|
||||
match &func.body[5].kind {
|
||||
match &func.body[7].kind {
|
||||
ir_vm::InstrKind::GateStore { offset } => assert_eq!(*offset, 100),
|
||||
_ => panic!("Expected GateStore 100"),
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user