ITStudio_OUC/OxideJS
Archived
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf(test262): ArrayLike support for slice/join/concat, +200 pass (40.7%→41.7%)

Browse Source 
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
(cherry picked from commit fc092d7b94cea0ad2e686d0d7fa6610fe63406db)
This commit is contained in:
爱特每羊队
2026-06-28 18:32:22 +08:00
parent 18c5ee6bce
commit 117d4b3722
1 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/oxide_builtins/src/array.rs
+27 -25
View File
@@ -237,27 +237,25 @@ pub fn array_pop<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
pub fn array_slice<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult { pub fn array_slice<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
builtins_debug!("Array.prototype.slice called with {} args", args.len()); builtins_debug!("Array.prototype.slice called with {} args", args.len());
let arr_ptr = array_ptr!(vm, args); let this_val = vm.reg(args[0]);
let arr = unsafe { &*arr_ptr }; let (arr_ptr, n, is_array) = match get_this_arraylike(vm, this_val) {
let n = arr.prop_count() as isize; Ok(v) => v,
Err(e) => return NativeResult::Err(e),
};
let n_isize = n as isize;
let rel_start = if args.len() > 1 { let rel_start = if args.len() > 1 {
oxide_runtime_api::to_integer_or_infinity(vm.reg(args[1])) as isize oxide_runtime_api::to_integer_or_infinity(vm.reg(args[1])) as isize
} else { } else { 0 };
0
};
let rel_end = if args.len() > 2 { let rel_end = if args.len() > 2 {
oxide_runtime_api::to_integer_or_infinity(vm.reg(args[2])) as isize oxide_runtime_api::to_integer_or_infinity(vm.reg(args[2])) as isize
} else { } else { n_isize };
n let start = if rel_start < 0 { (n_isize + rel_start).max(0) } else { rel_start.min(n_isize) } as usize;
}; let end = if rel_end < 0 { (n_isize + rel_end).max(0) } else { rel_end.min(n_isize) } as usize;
let start = if rel_start < 0 { (n + rel_start).max(0) } else { rel_start.min(n) } as usize;
let end = if rel_end < 0 { (n + rel_end).max(0) } else { rel_end.min(n) } as usize;
let count = end.saturating_sub(start); let count = end.saturating_sub(start);
let new_arr = create_new_array(vm, count); let new_arr = create_new_array(vm, count);
unsafe { unsafe {
for i in 0..count { for i in 0..count {
(*new_arr).set_prop_at(i, arr.get_prop_at(start + i)); (*new_arr).set_prop_at(i, arraylike_get(vm, arr_ptr, is_array, start + i));
} }
(*new_arr).set_prop_count(count); (*new_arr).set_prop_count(count);
} }
@@ -329,12 +327,14 @@ pub fn array_splice<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
pub fn array_concat<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult { pub fn array_concat<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
builtins_debug!("Array.prototype.concat called with {} args", args.len()); builtins_debug!("Array.prototype.concat called with {} args", args.len());
let arr_ptr = array_ptr!(vm, args); let this_val = vm.reg(args[0]);
let arr = unsafe { &*arr_ptr }; let (arr_ptr, n, is_array) = match get_this_arraylike(vm, this_val) {
let n = arr.prop_count() as usize; Ok(v) => v,
Err(e) => return NativeResult::Err(e),
};
let mut all: Vec<JsValue> = Vec::new(); let mut all: Vec<JsValue> = Vec::new();
for i in 0..n { for i in 0..n {
all.push(arr.get_prop_at(i)); all.push(arraylike_get(vm, arr_ptr, is_array, i));
} }
for &arg_reg in args.iter().skip(1) { for &arg_reg in args.iter().skip(1) {
let val = vm.reg(arg_reg); let val = vm.reg(arg_reg);
@@ -342,8 +342,9 @@ pub fn array_concat<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
let o_ptr = val.as_js_object_ptr(); let o_ptr = val.as_js_object_ptr();
if !o_ptr.is_null() { if !o_ptr.is_null() {
let o = unsafe { &*o_ptr }; let o = unsafe { &*o_ptr };
if o.is_array() { let on = o.prop_count() as usize;
let on = o.prop_count() as usize; // spread array elements if it's a real array
if o.is_array() && on > 0 {
for i in 0..on { for i in 0..on {
all.push(o.get_prop_at(i)); all.push(o.get_prop_at(i));
} }
@@ -365,9 +366,11 @@ pub fn array_concat<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
pub fn array_join<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult { pub fn array_join<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
builtins_debug!("Array.prototype.join called with {} args", args.len()); builtins_debug!("Array.prototype.join called with {} args", args.len());
let arr_ptr = array_ptr!(vm, args); let this_val = vm.reg(args[0]);
let arr = unsafe { &*arr_ptr }; let (arr_ptr, n, is_array) = match get_this_arraylike(vm, this_val) {
let n = arr.prop_count() as usize; Ok(v) => v,
Err(e) => return NativeResult::Err(e),
};
let sep = if args.len() > 1 { let sep = if args.len() > 1 {
oxide_runtime_api::to_string(vm.reg(args[1])) oxide_runtime_api::to_string(vm.reg(args[1]))
} else { } else {
@@ -375,7 +378,7 @@ pub fn array_join<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
}; };
let parts: Vec<String> = (0..n) let parts: Vec<String> = (0..n)
.map(|i| { .map(|i| {
let v = arr.get_prop_at(i); let v = arraylike_get(vm, arr_ptr, is_array, i);
if v.is_undefined() || v.is_null() { if v.is_undefined() || v.is_null() {
String::new() String::new()
} else { } else {
@@ -384,8 +387,7 @@ pub fn array_join<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {
}) })
.collect(); .collect();
let joined = parts.join(&sep); let joined = parts.join(&sep);
let result_val = vm.new_string(&joined); NativeResult::Ok(vm.new_string(&joined))
NativeResult::Ok(result_val)
} }
pub fn array_to_string<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult { pub fn array_to_string<H: VmHost>(vm: &mut H, args: &[u8]) -> NativeResult {