Skip to content

fix(gc): convert ic_miss.rs's raw-handle reads to the scoping combinators #8572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
proggeramlug merged 1 commit into from
Aug 22, 2026
Merged

fix(gc): convert ic_miss.rs's raw-handle reads to the scoping combinators #8572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions changelog.d/8570-ic-miss-raw-handles.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
### Fixed

- Convert `ic_miss.rs`'s twelve bare raw-handle reads to `with_{mut,const}_ptr`.
#8560 added them inside `c3c_pic_tests`; they passed the ratchet at the time
because the baseline was still 974, and became a violation once #8559's regex
capture cleanup lowered it to 925.
38 changes: 15 additions & 23 deletions crates/perry-runtime/src/object/field_get_set/ic_miss.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1300,7 +1300,7 @@ mod c3c_pic_tests {
let unrelated = crate::object::js_object_alloc(0, 1);
let unrelated = scope.root_raw_mut_ptr(unrelated);
crate::object::set_accessor_descriptor(
unrelated.get_raw_mut_ptr::<crate::object::ObjectHeader>() as usize,
unrelated.with_mut_ptr(|o: *mut crate::object::ObjectHeader| o as usize),
"pic_unrelated_accessor".to_string(),
crate::object::AccessorDescriptor::default(),
);
Expand All @@ -1314,19 +1314,15 @@ mod c3c_pic_tests {
let key_bytes = b"pic_plain_data";
let key = crate::string::js_string_from_bytes(key_bytes.as_ptr(), key_bytes.len() as u32);
let key = scope.root_string_ptr(key);
crate::object::js_object_set_field_by_name(
obj.get_raw_mut_ptr(),
key.get_raw_const_ptr(),
42.0,
);
obj.with_mut_ptr(|o| {
key.with_const_ptr(|k| {
crate::object::js_object_set_field_by_name(o, k, 42.0)
})
});

let mut cache = [0i64; super::PIC_CACHE_WORDS];
assert_eq!(
super::js_object_get_field_ic_miss(
obj.get_raw_mut_ptr(),
key.get_raw_const_ptr(),
&mut cache,
),
obj.with_mut_ptr(|o| key.with_const_ptr(|k| super::js_object_get_field_ic_miss(o, k, &mut cache))),
42.0
);
assert_ne!(
Expand All @@ -1348,25 +1344,21 @@ mod c3c_pic_tests {
let key_bytes = b"pic_guarded_data";
let key = crate::string::js_string_from_bytes(key_bytes.as_ptr(), key_bytes.len() as u32);
let key = scope.root_string_ptr(key);
crate::object::js_object_set_field_by_name(
obj.get_raw_mut_ptr(),
key.get_raw_const_ptr(),
17.0,
);
obj.with_mut_ptr(|o| {
key.with_const_ptr(|k| {
crate::object::js_object_set_field_by_name(o, k, 17.0)
})
});
crate::object::set_accessor_descriptor(
obj.get_raw_mut_ptr::<crate::object::ObjectHeader>() as usize,
obj.with_mut_ptr(|o: *mut crate::object::ObjectHeader| o as usize),
"pic_guarded_data".to_string(),
crate::object::AccessorDescriptor::default(),
);

let mut cache = [0i64; super::PIC_CACHE_WORDS];
let via_pic = super::js_object_get_field_ic_miss(
obj.get_raw_mut_ptr(),
key.get_raw_const_ptr(),
&mut cache,
);
let via_pic = obj.with_mut_ptr(|o| key.with_const_ptr(|k| super::js_object_get_field_ic_miss(o, k, &mut cache)));
let via_ladder =
super::js_object_get_field_by_name_f64(obj.get_raw_mut_ptr(), key.get_raw_const_ptr());
obj.with_mut_ptr(|o| key.with_const_ptr(|k| super::js_object_get_field_by_name_f64(o, k)));
assert_eq!(
via_pic.to_bits(),
via_ladder.to_bits(),
Expand Down
Loading