feat(jit): fix segfault

This commit is contained in:
2025-05-18 17:07:49 +08:00
parent f98d623c13
commit af5a312e1e
10 changed files with 115 additions and 111 deletions

View File

@@ -11,11 +11,11 @@ use super::Value;
#[repr(C)]
#[derive(Debug, Constructor, Clone, PartialEq)]
pub struct AttrSet<'vm> {
data: HashMap<usize, Value<'vm>>,
pub struct AttrSet<'jit: 'vm, 'vm> {
data: HashMap<usize, Value<'jit, 'vm>>,
}
impl<'vm> AttrSet<'vm> {
impl<'jit: 'vm, 'vm> AttrSet<'jit, 'vm> {
pub fn empty() -> Self {
AttrSet {
data: HashMap::new(),
@@ -28,18 +28,18 @@ impl<'vm> AttrSet<'vm> {
}
}
pub fn push_attr_force(&mut self, sym: usize, val: Value<'vm>) {
pub fn push_attr_force(&mut self, sym: usize, val: Value<'jit, 'vm>) {
self.data.insert(sym, val);
}
pub fn push_attr(&mut self, sym: usize, val: Value<'vm>) {
pub fn push_attr(&mut self, sym: usize, val: Value<'jit, 'vm>) {
if self.data.get(&sym).is_some() {
todo!()
}
self.data.insert(sym, val);
}
pub fn select(&self, sym: usize) -> Option<Value<'vm>> {
pub fn select(&self, sym: usize) -> Option<Value<'jit, 'vm>> {
self.data.get(&sym).cloned()
}
@@ -47,7 +47,7 @@ impl<'vm> AttrSet<'vm> {
self.data.get(&sym).is_some()
}
pub fn capture(&mut self, env: &Env<'vm>) {
pub fn capture(&mut self, env: &Env<'jit, 'vm>) {
self.data.iter().for_each(|(_, v)| match v.clone() {
Value::Thunk(ref thunk) => {
thunk.capture(env.clone());
@@ -56,21 +56,21 @@ impl<'vm> AttrSet<'vm> {
})
}
pub fn update(&mut self, other: &AttrSet<'vm>) {
pub fn update(&mut self, other: &AttrSet<'jit, 'vm>) {
for (k, v) in other.data.iter() {
self.push_attr_force(k.clone(), v.clone())
}
}
pub fn as_inner(&self) -> &HashMap<usize, Value<'vm>> {
pub fn as_inner(&self) -> &HashMap<usize, Value<'jit, 'vm>> {
&self.data
}
pub fn from_inner(data: HashMap<usize, Value<'vm>>) -> Self {
pub fn from_inner(data: HashMap<usize, Value<'jit, 'vm>>) -> Self {
Self { data }
}
pub fn force_deep(&mut self, vm: &'vm VM<'_>) -> Result<()> {
pub fn force_deep(&mut self, vm: &'vm VM<'jit>) -> Result<()> {
let mut map: Vec<_> = self
.data
.iter()
@@ -83,7 +83,7 @@ impl<'vm> AttrSet<'vm> {
Ok(())
}
pub fn eq_impl(&self, other: &AttrSet<'vm>, vm: &'vm VM<'_>) -> bool {
pub fn eq_impl(&self, other: &AttrSet<'jit, 'vm>, vm: &'vm VM<'jit>) -> bool {
self.data.iter().len() == other.data.iter().len()
&& std::iter::zip(
self.data.iter().sorted_by_key(|(k, _)| **k),
@@ -92,7 +92,7 @@ impl<'vm> AttrSet<'vm> {
.all(|((_, v1), (_, v2))| v1.eq_impl(v2, vm))
}
pub fn to_public(&self, vm: &'vm VM, seen: &mut HashSet<Value<'vm>>) -> p::Value {
pub fn to_public(&self, vm: &'vm VM, seen: &mut HashSet<Value<'jit, 'vm>>) -> p::Value {
p::Value::AttrSet(p::AttrSet::new(
self.data
.iter()