minor modification to lco in codegen
use std::cell::Cell;
use std::collections::{HashMap};
-use std::mem;
use std::rc::Rc;
use std::vec::Vec;
@@ -236,17 +235,14 @@ fn lco(code: &mut Code) -> usize
let mut dealloc_index = code.len() - 1;
match code.last_mut() {
- Some(&mut Line::Control(ref mut ctrl)) => {
- let old_ctrl = mem::replace(ctrl, ControlInstruction::Proceed);
-
- match old_ctrl {
- ControlInstruction::CallClause(ct, arity, pvs, false, use_default_cp) =>
- *ctrl = ControlInstruction::CallClause(ct, arity, pvs, true, use_default_cp),
- ControlInstruction::JmpBy(arity, offset, pvs, false) =>
- *ctrl = ControlInstruction::JmpBy(arity, offset, pvs, true),
- ControlInstruction::Proceed => {},
+ Some(&mut Line::Control(ref mut ctrl)) =>
+ match ctrl {
+ &mut ControlInstruction::CallClause(_, _, _, ref mut last_call, _) =>
+ *last_call = true,
+ &mut ControlInstruction::JmpBy(_, _, _, ref mut last_call) =>
+ *last_call = true,
+ &mut ControlInstruction::Proceed => {},
_ => dealloc_index += 1
- }
},
Some(&mut Line::Cut(CutInstruction::Cut(_))) =>
dealloc_index += 1,
