feat(jit): fix segfault
This commit is contained in:
@@ -4,28 +4,28 @@ use std::rc::Rc;
|
||||
use crate::ty::internal::{AttrSet, Value};
|
||||
|
||||
#[derive(Debug, Default, Clone)]
|
||||
pub struct Env<'vm> {
|
||||
last: Option<Rc<Env<'vm>>>,
|
||||
map: Rc<HashMap<usize, Value<'vm>>>,
|
||||
pub struct Env<'jit, 'vm> {
|
||||
last: Option<Rc<Env<'jit, 'vm>>>,
|
||||
map: Rc<HashMap<usize, Value<'jit, 'vm>>>,
|
||||
}
|
||||
|
||||
impl<'vm> Env<'vm> {
|
||||
impl<'jit, 'vm> Env<'jit, 'vm> {
|
||||
pub fn empty() -> Self {
|
||||
Env::default()
|
||||
}
|
||||
|
||||
pub fn lookup(&self, symbol: usize) -> Option<Value<'vm>> {
|
||||
pub fn lookup(&self, symbol: usize) -> Option<Value<'jit, 'vm>> {
|
||||
if let Some(val) = self.map.get(&symbol).cloned() {
|
||||
return Some(val);
|
||||
}
|
||||
self.last.as_ref().map(|env| env.lookup(symbol)).flatten()
|
||||
}
|
||||
|
||||
pub fn insert(&mut self, symbol: usize, value: Value<'vm>) {
|
||||
pub fn insert(&mut self, symbol: usize, value: Value<'jit, 'vm>) {
|
||||
Rc::make_mut(&mut self.map).insert(symbol, value);
|
||||
}
|
||||
|
||||
pub fn enter(self, new: impl Iterator<Item = (usize, Value<'vm>)>) -> Self {
|
||||
pub fn enter(self, new: impl Iterator<Item = (usize, Value<'jit, 'vm>)>) -> Self {
|
||||
let map = Rc::new(new.collect());
|
||||
let last = Some(
|
||||
Env {
|
||||
@@ -37,7 +37,7 @@ impl<'vm> Env<'vm> {
|
||||
Env { last, map }
|
||||
}
|
||||
|
||||
pub fn enter_with(self, new: Rc<AttrSet<'vm>>) -> Self {
|
||||
pub fn enter_with(self, new: Rc<AttrSet<'jit, 'vm>>) -> Self {
|
||||
let map = Rc::new(
|
||||
new.as_inner()
|
||||
.iter()
|
||||
|
||||
Reference in New Issue
Block a user