Track subcall read regions within read-only calls

This commit is contained in:
2026-10-21 16:31:04 +08:00
parent 4a2f81cb48
commit b7daabdaad
7 changed files with 76 additions and 2 deletions
+30
View File
@@ -39,6 +39,7 @@ struct Slot {
struct ReadOnly {
protected: BTreeSet<ObjectRef>,
reads: Mutex<BTreeSet<ObjectRef>>,
regions: Mutex<Vec<BTreeSet<ObjectRef>>>,
}
#[derive(Debug)]
@@ -84,6 +85,7 @@ impl Heap {
self.read_only.push(ReadOnly {
protected,
reads: Mutex::new(BTreeSet::new()),
regions: Mutex::new(Vec::new()),
});
self.read_only.len()
}
@@ -103,6 +105,26 @@ impl Heap {
.collect())
}
pub(crate) fn begin_read_tracking(&self) -> Result<usize, VmError> {
let scope = self.read_only.last().ok_or(VmError::InvalidArgument(
"read tracking requires a read-only scope",
))?;
let mut regions = scope.regions.lock().expect("read tracker poisoned");
regions.push(BTreeSet::new());
Ok(regions.len())
}
pub(crate) fn end_read_tracking(&self, token: usize) -> Result<Vec<ObjectRef>, VmError> {
let scope = self.read_only.last().ok_or(VmError::InvalidArgument(
"read tracking requires a read-only scope",
))?;
let mut regions = scope.regions.lock().expect("read tracker poisoned");
if token == 0 || token != regions.len() {
return Err(VmError::InvalidArgument("read tracking nesting mismatch"));
}
Ok(regions.pop().unwrap().into_iter().collect())
}
pub(crate) fn is_read_only(&self) -> bool {
!self.read_only.is_empty()
}
@@ -115,6 +137,14 @@ impl Heap {
.lock()
.expect("read tracker poisoned")
.insert(reference);
for region in scope
.regions
.lock()
.expect("read tracker poisoned")
.iter_mut()
{
region.insert(reference);
}
}
}
}