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

core: Use class index for `class_id`, instead of slot_id

This commit is contained in:
EmperorBale 2022-09-16 20:39:14 -07:00 committed by EmperorBale
parent e1eaa9770a
commit 7aa821da4f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/build_playerglobal/src/lib.rs
View File

@ -272,13 +272,13 @@ fn write_native_table(data: &[u8], out_dir: &Path) -> Result<Vec<u8>, Box<dyn st
// generate a reference to an allocator function in the native instance // generate a reference to an allocator function in the native instance
// allocators table. // allocators table.
let mut check_instance_allocator = |trait_: &Trait| { let mut check_instance_allocator = |trait_: &Trait| {
let class_id = if let TraitKind::Class { slot_id, .. } = trait_.kind { let class_id = if let TraitKind::Class { class, .. } = trait_.kind {
slot_id class.0
} else { } else {
return; return;
}; };
let class_name_idx = abc.instances[class_id as usize - 1].name.0; let class_name_idx = abc.instances[class_id as usize].name.0;
let class_name = resolve_multiname_name( let class_name = resolve_multiname_name(
&abc, &abc,
&abc.constant_pool.multinames[class_name_idx as usize - 1], &abc.constant_pool.multinames[class_name_idx as usize - 1],
@ -306,7 +306,7 @@ fn write_native_table(data: &[u8], out_dir: &Path) -> Result<Vec<u8>, Box<dyn st
(None, METADATA_INSTANCE_ALLOCATOR) => { (None, METADATA_INSTANCE_ALLOCATOR) => {
// This results in a path of the form // This results in a path of the form
// `crate::avm2::globals::<path::to::class>::<class_allocator>` // `crate::avm2::globals::<path::to::class>::<class_allocator>`
rust_instance_allocators[class_id as usize - 1] = rust_instance_allocators[class_id as usize] =
rust_method_path(&abc, trait_, None, "", &method_name); rust_method_path(&abc, trait_, None, "", &method_name);
} }
_ => panic!("Unexpected metadata pair ({:?}, {})", key, value), _ => panic!("Unexpected metadata pair ({:?}, {})", key, value),