liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

avm2: Use return type of `ConstructProp` in optimizer

This commit is contained in:
Lord-McSweeney 2024-07-11 16:16:08 +03:00 committed by Lord-McSweeney
parent 604ac514b8
commit ea0bbce184
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
core/src/avm2/optimize.rs
View File

@ -1161,16 +1161,40 @@ pub fn optimize<'gc>(
multiname,
num_args,
} => {
let mut stack_push_done = false;
// Arguments
stack.popn(*num_args);
stack.pop_for_multiname(*multiname);
// Then receiver.
stack.pop();
let stack_value = stack.pop_or_any();
// Avoid checking return value for now
stack.push_any();
if !multiname.has_lazy_component() {
if let Some(vtable) = stack_value.vtable() {
match vtable.get_trait(multiname) {
Some(Property::Slot { slot_id })
| Some(Property::ConstSlot { slot_id }) => {
let mut value_class = vtable.slot_classes()[slot_id as usize];
let resolved_value_class = value_class.get_class(activation);
if let Ok(Some(slot_class)) = resolved_value_class {
if let Some(instance_class) = slot_class.i_class() {
// ConstructProp on a c_class will construct its i_class
stack_push_done = true;
stack.push_class(instance_class);
}
}
}
_ => {}
}
}
}
if !stack_push_done {
stack.push_any();
}
}
Op::Call { num_args } => {
// Arguments