Skip to content

fix(lint): bring field_set_by_name.rs back under the 2000-line cap #7401

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 2 commits into from
Aug 4, 2026
Merged

fix(lint): bring field_set_by_name.rs back under the 2000-line cap #7401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e39dc4b
fix(lint): bring field_set_by_name.rs back under the 2000-line cap
Aug 4, 2026
4733614
docs: name the fragment for its real PR (#7401)
Aug 4, 2026
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
11 changes: 11 additions & 0 deletions changelog.d/7401-field-set-file-size.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
**Fixed** `lint` was red on `main` — a required check — because #7381 and #7383
pushed `field_set_by_name.rs` from 1990 to 2048 lines, past the 2000-line cap.

The overrun was comment volume, not code: eight `refresh_roots_after_alloc!()`
call sites each carried a multi-line rationale block. The rationale now sits once
at the macro that implements it, which is where it belonged anyway, and the call
sites are bare.

I originally checked this against `origin/main` and concluded it was
pre-existing. That baseline already contained the two merges that caused it. The
correct comparison is against a commit from before the change — 1990 lines.
52 changes: 2 additions & 50 deletions crates/perry-runtime/src/object/field_set_by_name.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1304,6 +1304,8 @@ pub extern "C" fn js_object_set_field_by_name(

let mut prev_keys_usize = keys as usize;

// #7341: call after ANY allocating step, before the next use of
// obj/key/value. Rationale in changelog.d/7381-*, 7383-*.
macro_rules! refresh_roots_after_alloc {
() => {{
obj = obj_handle.get_raw_mut_ptr::<ObjectHeader>();
Expand Down Expand Up @@ -1404,16 +1406,6 @@ pub extern "C" fn js_object_set_field_by_name(
// (bundled zod assigns `create` onto ~40 sibling class
// objects), so from the SECOND class on the write lands
// here — the mirror must fire on this path too.
// #7341: the own-data write just above can reach an allocator --
// `overflow_set` inserts into a Rust map, and a minor GC triggers on
// the malloc-count threshold as well as on arena blocks. The mirror's
// FIRST instruction dereferences `obj` (`ldr w8, [x0]` at +24), so a
// collection in that write leaves it reading from-space.
//
// Scoped deliberately to the two own-data-write arms. The macro also
// republishes `value` from its handle, so an arm that intentionally
// rebinds `value` locally must NOT refresh here -- applying it to all
// eight mirror sites is wrong for that reason.
refresh_roots_after_alloc!();
mirror_class_object_static_write(obj, key, value);
return;
Expand Down Expand Up @@ -1450,16 +1442,6 @@ pub extern "C" fn js_object_set_field_by_name(
(*obj).field_count = 1;
}
js_object_set_field(obj, 0, JSValue::from_bits(value.to_bits()));
// #7341: the own-data write just above can reach an allocator --
// `overflow_set` inserts into a Rust map, and a minor GC triggers on
// the malloc-count threshold as well as on arena blocks. The mirror's
// FIRST instruction dereferences `obj` (`ldr w8, [x0]` at +24), so a
// collection in that write leaves it reading from-space.
//
// Scoped deliberately to the two own-data-write arms. The macro also
// republishes `value` from its handle, so an arm that intentionally
// rebinds `value` locally must NOT refresh here -- applying it to all
// eight mirror sites is wrong for that reason.
refresh_roots_after_alloc!();
mirror_class_object_static_write(obj, key, value);
// Record the null→single-key transition so the next object
Expand Down Expand Up @@ -1574,11 +1556,6 @@ pub extern "C" fn js_object_set_field_by_name(
};
overflow_set(obj as usize, i, vbits);
}
// #7341: same as the two own-data-write arms -- the write above can
// reach an allocator and the mirror's first instruction dereferences
// `obj`. None of these arms rebinds `obj`/`key`/`value` after the
// handles are taken, so republishing all four is a no-op except for
// the relocation it repairs.
refresh_roots_after_alloc!();
mirror_class_object_static_write(obj, key, value);
return;
Expand Down Expand Up @@ -1650,11 +1627,6 @@ pub extern "C" fn js_object_set_field_by_name(
super::shapes::shape_keys_grown(prev_keys_usize, new_keys);
}
overflow_set(obj as usize, new_index, vbits);
// #7341: same as the two own-data-write arms -- the write above can
// reach an allocator and the mirror's first instruction dereferences
// `obj`. None of these arms rebinds `obj`/`key`/`value` after the
// handles are taken, so republishing all four is a no-op except for
// the relocation it repairs.
refresh_roots_after_alloc!();
mirror_class_object_static_write(obj, key, value);
transition_cache_insert(
Expand Down Expand Up @@ -1697,11 +1669,6 @@ pub extern "C" fn js_object_set_field_by_name(
(*obj).field_count = new_index as u32 + 1;
}
js_object_set_field(obj, new_index as u32, JSValue::from_bits(value.to_bits()));
// #7341: same as the two own-data-write arms -- the write above can
// reach an allocator and the mirror's first instruction dereferences
// `obj`. None of these arms rebinds `obj`/`key`/`value` after the
// handles are taken, so republishing all four is a no-op except for
// the relocation it repairs.
refresh_roots_after_alloc!();
mirror_class_object_static_write(obj, key, value);
transition_cache_insert(
Expand Down Expand Up @@ -1773,11 +1740,6 @@ pub extern "C" fn js_object_set_field_by_name(
};
overflow_set(obj as usize, i, vbits);
}
// #7341: same as the two own-data-write arms -- the write above can
// reach an allocator and the mirror's first instruction dereferences
// `obj`. None of these arms rebinds `obj`/`key`/`value` after the
// handles are taken, so republishing all four is a no-op except for
// the relocation it repairs.
refresh_roots_after_alloc!();
mirror_class_object_static_write(obj, key, value);
return;
Expand Down Expand Up @@ -1867,11 +1829,6 @@ pub extern "C" fn js_object_set_field_by_name(
super::shapes::shape_keys_grown(prev_keys_usize, new_keys);
}
overflow_set(obj as usize, new_index, vbits);
// #7341: same as the two own-data-write arms -- the write above can
// reach an allocator and the mirror's first instruction dereferences
// `obj`. None of these arms rebinds `obj`/`key`/`value` after the
// handles are taken, so republishing all four is a no-op except for
// the relocation it repairs.
refresh_roots_after_alloc!();
mirror_class_object_static_write(obj, key, value);
// Record the shape transition so the next object sharing
Expand Down Expand Up @@ -1916,11 +1873,6 @@ pub extern "C" fn js_object_set_field_by_name(
(*obj).field_count = new_index as u32 + 1;
}
js_object_set_field(obj, new_index as u32, JSValue::from_bits(value.to_bits()));
// #7341: same as the two own-data-write arms -- the write above can
// reach an allocator and the mirror's first instruction dereferences
// `obj`. None of these arms rebinds `obj`/`key`/`value` after the
// handles are taken, so republishing all four is a no-op except for
// the relocation it repairs.
refresh_roots_after_alloc!();
mirror_class_object_static_write(obj, key, value);
// Record the shape transition — see above for semantics.
Expand Down
Loading