avm2: Move interface logic from ClassObject to Class

Author: Lord-McSweeney

core/src/avm2/class.rs

@@ -104,7 +104,10 @@ pub struct ClassData<'gc> {
     /// superinterfaces, nor interfaces implemented by the superclass.
     direct_interfaces: Vec<Class<'gc>>,
 
-    /// The list of all interfaces implemented by this class.
+    /// Interfaces implemented by this class, including interfaces
+    /// from parent classes and superinterfaces (recursively).
+    /// TODO - avoid cloning this when a subclass implements the
+    /// same interface as its superclass.
     all_interfaces: Vec<Class<'gc>>,
 
     /// The instance allocator for this class.
@@ -633,7 +636,7 @@ impl<'gc> Class<'gc> {
                     .into());
                 }
 
-                if dedup.insert(ClassHashWrapper(*interface)) {
+                if dedup.insert(*interface) {
                     queue.push(*interface);
                     interfaces.push(*interface);
                 }
@@ -1149,18 +1152,3 @@ impl<'gc> Class<'gc> {
         self.0.read().attributes.contains(ClassAttributes::GENERIC)
     }
 }
-
-pub struct ClassHashWrapper<'gc>(pub Class<'gc>);
-
-impl<'gc> PartialEq for ClassHashWrapper<'gc> {
-    fn eq(&self, other: &Self) -> bool {
-        GcCell::ptr_eq(self.0 .0, other.0 .0)
-    }
-}
-impl<'gc> Eq for ClassHashWrapper<'gc> {}
-
-impl<'gc> Hash for ClassHashWrapper<'gc> {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        self.0 .0.as_ptr().hash(state);
-    }
-}

core/src/avm2/globals/avmplus.rs

@@ -279,7 +279,7 @@ fn describe_internal_body<'gc>(
     };
 
     if flags.contains(DescribeTypeFlags::INCLUDE_INTERFACES) && use_instance_traits {
-        for interface in class_obj.interfaces() {
+        for interface in &*class_obj.inner_class_definition().all_interfaces() {
             let interface_name = interface
                 .name()
                 .to_qualified_name(activation.context.gc_context);

core/src/avm2/object/class_object.rs

@@ -1,7 +1,7 @@
 //! Class object impl
 
 use crate::avm2::activation::Activation;
-use crate::avm2::class::{Allocator, AllocatorFn, Class, ClassHashWrapper};
+use crate::avm2::class::{Allocator, AllocatorFn, Class};
 use crate::avm2::error::{argument_error, make_error_1127, reference_error, type_error};
 use crate::avm2::function::exec;
 use crate::avm2::method::Method;
@@ -20,7 +20,6 @@ use crate::string::AvmString;
 use fnv::FnvHashMap;
 use gc_arena::{Collect, GcCell, GcWeakCell, Mutation};
 use std::cell::{BorrowError, Ref, RefMut};
-use std::collections::HashSet;
 use std::fmt::Debug;
 use std::hash::{Hash, Hasher};
 
@@ -82,12 +81,6 @@ pub struct ClassObjectData<'gc> {
     /// we get a param of `null`.
     applications: FnvHashMap<Option<Class<'gc>>, ClassObject<'gc>>,
 
-    /// Interfaces implemented by this class, including interfaces
-    /// from parent classes and superinterfaces (recursively).
-    /// TODO - avoid cloning this when a subclass implements the
-    /// same interface as its superclass.
-    interfaces: Vec<Class<'gc>>,
-
     /// VTable used for instances of this class.
     instance_vtable: VTable<'gc>,
 
@@ -205,7 +198,6 @@ impl<'gc> ClassObject<'gc> {
                 native_constructor: class.native_instance_init(),
                 call_handler: class.call_handler(),
                 applications: Default::default(),
-                interfaces: Vec::new(),
                 instance_vtable: VTable::empty(activation.context.gc_context),
                 class_vtable: VTable::empty(activation.context.gc_context),
             },
@@ -318,43 +310,13 @@ impl<'gc> ClassObject<'gc> {
     /// instance traits will be resolved to their corresponding methods at this
     /// time.
     pub fn link_interfaces(self, activation: &mut Activation<'_, 'gc>) -> Result<(), Error<'gc>> {
-        let mut write = self.0.write(activation.context.gc_context);
-        let class = write.class;
-
-        let mut interfaces = Vec::with_capacity(class.direct_interfaces().len());
-
-        let mut dedup = HashSet::new();
-        let mut queue = vec![class];
-        while let Some(cls) = queue.pop() {
-            for interface in &*cls.direct_interfaces() {
-                if !interface.is_interface() {
-                    return Err(format!(
-                        "Class {:?} is not an interface and cannot be implemented by classes",
-                        interface.name().local_name()
-                    )
-                    .into());
-                }
-
-                if dedup.insert(ClassHashWrapper(*interface)) {
-                    queue.push(*interface);
-                    interfaces.push(*interface);
-                }
-            }
-
-            if let Some(super_class) = cls.super_class() {
-                queue.push(super_class);
-            }
-        }
-        write.interfaces = interfaces;
-        drop(write);
-
-        let read = self.0.read();
+        let class = self.inner_class_definition();
 
         // FIXME - we should only be copying properties for newly-implemented
         // interfaces (i.e. those that were not already implemented by the superclass)
         // Otherwise, our behavior diverges from Flash Player in certain cases.
         // See the ignored test 'tests/tests/swfs/avm2/weird_superinterface_properties/'
-        for interface in &read.interfaces {
+        for interface in &*class.all_interfaces() {
             for interface_trait in &*interface.instance_traits() {
                 if !interface_trait.name().namespace().is_public() {
                     let public_name = QName::new(
@@ -760,10 +722,6 @@ impl<'gc> ClassObject<'gc> {
         self.0.read().prototype.unwrap()
     }
 
-    pub fn interfaces(self) -> Vec<Class<'gc>> {
-        self.0.read().interfaces.clone()
-    }
-
     pub fn class_scope(self) -> ScopeChain<'gc> {
         self.0.read().class_scope
     }

core/src/debug_ui/avm2.rs

@@ -213,7 +213,7 @@ impl Avm2ObjectWindow {
 
                 ui.label("Interfaces");
                 ui.vertical(|ui| {
-                    for interface in class.interfaces() {
+                    for interface in &*class.inner_class_definition().all_interfaces() {
                         ui.text_edit_singleline(
                             &mut interface
                                 .name()