avm2: Store a class->alias mapping instead of a ClassObject->alias mapping for AMF

Author: Lord-McSweeney

core/src/avm2.rs

@@ -180,7 +180,7 @@ pub struct Avm2<'gc> {
     orphan_objects: Rc<Vec<DisplayObjectWeak<'gc>>>,
 
     alias_to_class_map: FnvHashMap<AvmString<'gc>, ClassObject<'gc>>,
-    class_to_alias_map: FnvHashMap<ClassObject<'gc>, AvmString<'gc>>,
+    class_to_alias_map: FnvHashMap<Class<'gc>, AvmString<'gc>>,
 
     /// The api version of our root movie clip. Note - this is used as the
     /// api version for swfs loaded via `Loader`, overriding the api version
@@ -294,14 +294,15 @@ impl<'gc> Avm2<'gc> {
 
     pub fn register_class_alias(&mut self, name: AvmString<'gc>, class_object: ClassObject<'gc>) {
         self.alias_to_class_map.insert(name, class_object);
-        self.class_to_alias_map.insert(class_object, name);
+        self.class_to_alias_map
+            .insert(class_object.inner_class_definition(), name);
     }
 
     pub fn get_class_by_alias(&self, name: AvmString<'gc>) -> Option<ClassObject<'gc>> {
         self.alias_to_class_map.get(&name).copied()
     }
 
-    pub fn get_alias_by_class(&self, cls: ClassObject<'gc>) -> Option<AvmString<'gc>> {
+    pub fn get_alias_by_class(&self, cls: Class<'gc>) -> Option<AvmString<'gc>> {
         self.class_to_alias_map.get(&cls).copied()
     }
 

core/src/avm2/amf.rs

@@ -1,6 +1,7 @@
 use std::rc::Rc;
 
 use crate::avm2::bytearray::ByteArrayStorage;
+use crate::avm2::class::Class;
 use crate::avm2::object::{ByteArrayObject, ClassObject, TObject, VectorObject};
 use crate::avm2::vector::VectorStorage;
 use crate::avm2::ArrayObject;
@@ -178,7 +179,7 @@ fn alias_to_class<'gc>(
     }
 }
 
-fn class_to_alias<'gc>(activation: &mut Activation<'_, 'gc>, class: ClassObject<'gc>) -> String {
+fn class_to_alias<'gc>(activation: &mut Activation<'_, 'gc>, class: Class<'gc>) -> String {
     if let Some(alias) = activation.avm2().get_alias_by_class(class) {
         alias.to_string()
     } else {