Skip to content
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

avm1: avoid creating a temporary Vec in Array.prototype.splice #19504

Merged
merged 1 commit into from
Feb 12, 2025
+6 −9
Merged

avm1: avoid creating a temporary Vec in Array.prototype.splice #19504

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
15 changes: 6 additions & 9 deletions core/src/avm1/globals/array.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,12 +309,12 @@ pub fn splice<'gc>(
this: Object<'gc>,
args: &[Value<'gc>],
) -> Result<Value<'gc>, Error<'gc>> {
if args.is_empty() {
let Some(start) = args.get(0) else {
return Ok(Value::Undefined);
}
};

let length = this.length(activation)?;
let start = make_index_absolute(args.get(0).unwrap().coerce_to_i32(activation)?, length);
let start = make_index_absolute(start.coerce_to_i32(activation)?, length);
let delete_count = if let Some(arg) = args.get(1) {
let delete_count = arg.coerce_to_i32(activation)?;
if delete_count < 0 {
Expand All @@ -325,9 +325,8 @@ pub fn splice<'gc>(
length - start
};

let result_elements: Vec<_> = (0..delete_count)
.map(|i| this.get_element(activation, start + i))
.collect();
let result = ArrayObject::builder(activation)
.with((0..delete_count).map(|i| this.get_element(activation, start + i)));

let items = if args.len() > 2 { &args[2..] } else { &[] };
if items.len() as i32 > delete_count {
Expand Down Expand Up @@ -361,9 +360,7 @@ pub fn splice<'gc>(
}
this.set_length(activation, length - delete_count + items.len() as i32)?;

Ok(ArrayObject::builder(activation)
.with(result_elements)
.into())
Ok(result.into())
}

pub fn concat<'gc>(
Expand Down