feat: track borrowed name-level dependencies across read-only calls

This commit is contained in:
2026-10-24 01:39:49 +08:00
parent 89b817447e
commit a775d5c827
9 changed files with 221 additions and 42 deletions
+8 -7
View File
@@ -131,7 +131,7 @@ impl Vm {
let prepared = self.prepare_call(function, arguments.to_vec(), &mut executed, limits);
match prepared {
Ok(PreparedCall::Value(value)) => {
let reads = match self.objects.end_read_only(scope) {
let reads = match self.objects.end_read_only_precise(scope) {
Ok(reads) => reads,
Err(error) => {
self.drop_root(value);
@@ -140,7 +140,8 @@ impl Vm {
};
Ok(ExecutionProgress::Complete {
value,
reads,
dependencies: reads.dependencies,
reads: reads.objects,
instructions: executed,
})
}
@@ -216,11 +217,12 @@ impl Vm {
while let Some(frame) = call.frames.pop() {
self.clear_frame(frame);
}
let reads = self.objects.end_read_only(call.scope);
let reads = self.objects.end_read_only_precise(call.scope);
match (result, reads) {
(Ok(Some(value)), Ok(reads)) => Ok(ExecutionProgress::Complete {
value,
reads,
dependencies: reads.dependencies,
reads: reads.objects,
instructions: call.executed,
}),
(Ok(Some(value)), Err(error)) => {
@@ -1077,12 +1079,11 @@ impl Vm {
}
Opcode::LoadGlobal => {
let name = &frame.executable.layout().names[argument];
let key = Value::Text(name.clone());
let mut value = self.dict_get(frame.globals, &key)?;
let mut value = self.objects.dict_get_name(frame.globals, name)?;
if value.is_none()
&& let Some(builtins) = frame.builtins
{
value = self.dict_get(builtins, &key)?;
value = self.objects.dict_get_name(builtins, name)?;
}
let value = value.ok_or_else(|| VmError::NameNotFound(name.clone()))?;
self.push_borrowed(frame, value)?;
+1
View File
@@ -103,6 +103,7 @@ pub enum ExecutionProgress {
Complete {
value: Value,
reads: Vec<ObjectRef>,
dependencies: Vec<crate::ReadDependency>,
instructions: usize,
},
}
+2 -2
View File
@@ -58,7 +58,7 @@ pub use objects::{
EndorNativeCall, EndorNativeFunctionObject, EndorNumber, EndorNumberObject, EndorObject,
EndorRational, EndorReal, EndorStringObject, EndorTracebackEntry, Instruction, NativeCall,
NativeCallable, NativeContext, NativeFunction, NativeResult, ObjectChange, ObjectHeader,
ObjectPayload, ObjectRef, Opcode, ReadAccess, Record, SourceSignature, Value, VmError,
WeakObjectRef,
ObjectPayload, ObjectRef, Opcode, ReadAccess, ReadDependency, ReadSet, Record, SourceSignature,
TrackedReads, Value, VmError, WeakObjectRef,
};
pub use vm::Vm;