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

@@ -8,20 +8,20 @@ use crate::vm::VM;
use super::Value;
#[derive(Debug, Clone, Constructor)]
pub struct PrimOp<'vm> {
pub struct PrimOp<'jit: 'vm, 'vm> {
pub name: &'static str,
arity: usize,
func: fn(&'vm VM<'_>, Vec<Value<'vm>>) -> Result<Value<'vm>>,
func: fn(&'vm VM<'jit>, Vec<Value<'jit, 'vm>>) -> Result<Value<'jit, 'vm>>,
}
impl PartialEq for PrimOp<'_> {
impl PartialEq for PrimOp<'_, '_> {
fn eq(&self, _: &Self) -> bool {
false
}
}
impl<'vm> PrimOp<'vm> {
pub fn call(&self, vm: &'vm VM<'_>, args: Vec<Value<'vm>>) -> Result<Value<'vm>> {
impl<'jit, 'vm> PrimOp<'jit, 'vm> {
pub fn call(&self, vm: &'vm VM<'jit>, args: Vec<Value<'jit, 'vm>>) -> Result<Value<'jit, 'vm>> {
if (args.len()) < self.arity {
Value::PartialPrimOp(
PartialPrimOp {
@@ -42,21 +42,21 @@ impl<'vm> PrimOp<'vm> {
}
#[derive(Debug, Clone)]
pub struct PartialPrimOp<'vm> {
pub struct PartialPrimOp<'jit: 'vm, 'vm> {
pub name: &'static str,
arity: usize,
args: Vec<Value<'vm>>,
func: fn(&'vm VM<'_>, Vec<Value<'vm>>) -> Result<Value<'vm>>,
args: Vec<Value<'jit, 'vm>>,
func: fn(&'vm VM<'jit>, Vec<Value<'jit, 'vm>>) -> Result<Value<'jit, 'vm>>,
}
impl PartialEq for PartialPrimOp<'_> {
impl PartialEq for PartialPrimOp<'_, '_> {
fn eq(&self, _: &Self) -> bool {
false
}
}
impl<'vm> PartialPrimOp<'vm> {
pub fn call(self: &Rc<Self>, vm: &'vm VM<'_>, args: Vec<Value<'vm>>) -> Result<Value<'vm>> {
impl<'jit: 'vm, 'vm> PartialPrimOp<'jit, 'vm> {
pub fn call(self: &Rc<Self>, vm: &'vm VM<'jit>, args: Vec<Value<'jit, 'vm>>) -> Result<Value<'jit, 'vm>> {
let len = args.len();
let mut self_clone = self.clone();
let self_mut = Rc::make_mut(&mut self_clone);