Skip to content

Revert #9326 — it breaks cc --help on main (defineProperty TypeError); fixes #9341 #9345

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
Sep 1, 2026
Merged

Revert #9326 — it breaks cc --help on main (defineProperty TypeError); fixes #9341 #9345

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
25 changes: 0 additions & 25 deletions changelog.d/9220-array-prototype-index-paths.md
View file
Open in desktop

This file was deleted.

29 changes: 1 addition & 28 deletions crates/perry-runtime/src/array/generic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,13 +430,6 @@ pub(super) fn al_get(recv: f64, k: i64) -> f64 {
if k < 0 {
return undef();
}
// #9221: explicit Array.prototype.<method>.call(array, ...) must use
// the same recorded-prototype Get as a direct `array[k]`. Default-chain
// arrays retain the old `js_array_get_f64` lane, and Proxy prototypes
// remain on their dedicated path (the classification returns None).
if real_array_uses_recorded_spec_path(arr) {
return crate::array::array_spec_get(arr, k as u32);
}
return js_array_get_f64(arr, k as u32);
}
let b = recv.to_bits();
Expand Down Expand Up @@ -542,17 +535,6 @@ fn object_get_property_chain(obj_ptr: usize, k: i64) -> f64 {
undef()
}

/// Whether a genuine Array receiver must use the #9219 recorded-prototype
/// classification for indexed Get/HasProperty. The process latch keeps the
/// per-array side-table probe out of programs that never retarget an array;
/// the classification itself excludes Proxy prototypes so their existing
/// dedicated trap path is not invoked twice.
#[inline]
fn real_array_uses_recorded_spec_path(arr: *const ArrayHeader) -> bool {
crate::object::prototype_chain::array_static_proto_recorded()
&& unsafe { crate::array::array_custom_prototype(arr).is_some() }
}

/// `HasProperty(ToObject(recv), k)`.
pub(super) fn al_has(recv: f64, k: i64) -> bool {
if k < 0 {
Expand All @@ -566,17 +548,8 @@ pub(super) fn al_has(recv: f64, k: i64) -> bool {
}
let el = *((arr as *const u8).add(std::mem::size_of::<ArrayHeader>()) as *const f64)
.add(k as usize);
if el.to_bits() != TAG_HOLE {
return true;
}
return el.to_bits() != TAG_HOLE;
}
// #9221: a hole is absent only from the receiver. On a retargeted
// array, HasProperty must walk the recorded chain; this is exactly the
// `ArrayCustomProto::{Null, Array, Other}` policy used by direct reads.
if real_array_uses_recorded_spec_path(arr) {
return crate::array::array_spec_has_index(arr, k as u32);
}
return false;
}
let b = recv.to_bits();
if is_string_value(b) {
Expand Down
Loading
Loading