avm1: Allow non-object prototypes in Object::new

Progresses some Gnash tests

Author: moulins

core/src/avm1/activation.rs

@@ -1039,9 +1039,7 @@ impl<'a, 'gc> Activation<'a, 'gc> {
 
         //TODO: What happens if we try to extend an object which has no `prototype`?
         //e.g. `class Whatever extends Object.prototype` or `class Whatever extends 5`
-        let super_prototype = superclass
-            .get(istr!(self, "prototype"), self)?
-            .coerce_to_object(self);
+        let super_prototype = superclass.get(istr!(self, "prototype"), self)?;
 
         let sub_prototype = Object::new(self.strings(), Some(super_prototype));
 

core/src/avm1/function.rs

@@ -231,7 +231,7 @@ impl<'gc> Avm1Function<'gc> {
         // `f[""]()` emits a CallMethod op, causing `this` to be undefined, but `super` is a function; what is it?
         let zuper = this.filter(|_| !suppress).map(|this| {
             let zuper = NativeObject::Super(SuperObject::new(this, depth));
-            Object::new_with_native(frame.strings(), None, zuper).into()
+            Object::new_with_native(frame.strings(), None::<Value<'_>>, zuper).into()
         });
 
         if preload {
@@ -656,9 +656,7 @@ impl<'gc> FunctionObject<'gc> {
         callee: Object<'gc>,
         args: &[Value<'gc>],
     ) -> Result<Value<'gc>, Error<'gc>> {
-        let prototype = callee
-            .get(istr!("prototype"), activation)?
-            .coerce_to_object(activation);
+        let prototype = callee.get(istr!("prototype"), activation)?;
         let this = Object::new(activation.strings(), Some(prototype));
 
         Self::define_constructor_props(activation, this, callee.into());

core/src/avm1/globals.rs

@@ -545,7 +545,7 @@ pub fn create_globals<'gc>(
     as_broadcaster::BroadcasterFunctions<'gc>,
 ) {
     let context = {
-        let object_proto = Object::new(context, None);
+        let object_proto = Object::new_without_proto(context.gc());
         &mut DeclContext {
             object_proto,
             fn_proto: Object::new(context, Some(object_proto)),

core/src/avm1/globals/bitmap_filter.rs

@@ -12,7 +12,7 @@ use crate::avm1::globals::glow_filter::GlowFilter;
 use crate::avm1::globals::gradient_filter::GradientFilter;
 use crate::avm1::object::NativeObject;
 use crate::avm1::property_decl::{DeclContext, Declaration, SystemClass};
-use crate::avm1::{Attribute, Object, Value};
+use crate::avm1::{Object, Value};
 use crate::context::UpdateContext;
 use ruffle_macros::istr;
 use ruffle_render::filters::Filter;
@@ -66,7 +66,7 @@ pub fn clone<'gc>(
         _ => return Ok(Value::Undefined),
     };
     let proto = this.get_local_stored(istr!("__proto__"), activation);
-    Ok(create_instance(activation, native, proto).into())
+    Ok(Object::new_with_native(activation.strings(), proto, native).into())
 }
 
 pub fn avm1_to_filter<'gc>(
@@ -149,26 +149,5 @@ pub fn filter_to_avm1<'gc>(activation: &mut Activation<'_, 'gc>, filter: Filter)
             )
         }
     };
-
-    create_instance(activation, native, Some(proto.into())).into()
-}
-
-pub fn create_instance<'gc>(
-    activation: &mut Activation<'_, 'gc>,
-    native: NativeObject<'gc>,
-    proto: Option<Value<'gc>>,
-) -> Object<'gc> {
-    let result = Object::new(activation.strings(), None);
-    // Set `__proto__` manually since `Object::new()` doesn't support primitive prototypes.
-    // TODO: Pass `proto` to `Object::new()` once possible.
-    if let Some(proto) = proto {
-        result.define_value(
-            activation.gc(),
-            istr!("__proto__"),
-            proto,
-            Attribute::DONT_ENUM | Attribute::DONT_DELETE,
-        );
-    }
-    result.set_native(activation.gc(), native);
-    result
+    Object::new_with_native(activation.strings(), Some(proto), native).into()
 }

core/src/avm1/globals/function.rs

@@ -40,7 +40,7 @@ fn function<'gc>(
 ) -> Result<Value<'gc>, Error<'gc>> {
     Ok(args.get(0).copied().unwrap_or_else(|| {
         // Calling `Function()` seems to give a prototypeless bare object.
-        Object::new(&activation.context.strings, None).into()
+        Object::new_without_proto(activation.gc()).into()
     }))
 }
 

core/src/avm1/globals/movie_clip_loader.rs

@@ -147,7 +147,7 @@ fn get_progress<'gc>(
             Value::MovieClip(_) => target.coerce_to_object(activation).as_display_object(),
             _ => return Ok(Value::Undefined),
         };
-        let result = Object::new(&activation.context.strings, None);
+        let result = Object::new_without_proto(activation.gc());
         if let Some(target) = target {
             result.define_value(
                 activation.gc(),

core/src/avm1/globals/object.rs

@@ -98,7 +98,7 @@ fn function<'gc>(
     args: &[Value<'gc>],
 ) -> Result<Value<'gc>, Error<'gc>> {
     let obj = match args.get(0).unwrap_or(&Value::Undefined) {
-        Value::Undefined | Value::Null => Object::new(&activation.context.strings, None),
+        Value::Undefined | Value::Null => Object::new_without_proto(activation.gc()),
         val => val.coerce_to_object(activation),
     };
     Ok(obj.into())

core/src/avm1/globals/text_format.rs

@@ -538,7 +538,7 @@ fn get_text_extent<'gc>(
     temp_edittext.set_new_text_format(text_format.clone());
     temp_edittext.set_text(&text, activation.context);
 
-    let result = Object::new(&activation.context.strings, None);
+    let result = Object::new_without_proto(activation.gc());
     let metrics = temp_edittext
         .layout_metrics()
         .expect("All text boxes should have at least one line at all times");

core/src/avm1/globals/xml.rs

@@ -97,7 +97,7 @@ impl<'gc> Xml<'gc> {
                 root,
                 xml_decl: Lock::new(None),
                 doctype: Lock::new(None),
-                id_map: Object::new(context, None),
+                id_map: Object::new_without_proto(context.gc()),
                 status: Cell::new(XmlStatus::NoError),
             },
         ));

core/src/avm1/object/script_object.rs

@@ -111,11 +111,27 @@ impl<'gc> Object<'gc> {
         ObjectWeak(Gc::downgrade(self.0))
     }
 
-    pub fn new(context: &StringContext<'gc>, proto: Option<Object<'gc>>) -> Self {
+    pub fn new(context: &StringContext<'gc>, proto: Option<impl Into<Value<'gc>>>) -> Self {
+        Self::new_impl(context, proto.map(Into::into), NativeObject::None)
+    }
+
+    pub fn new_with_native(
+        context: &StringContext<'gc>,
+        proto: Option<impl Into<Value<'gc>>>,
+        native: NativeObject<'gc>,
+    ) -> Self {
+        Self::new_impl(context, proto.map(Into::into), native)
+    }
+
+    fn new_impl(
+        context: &StringContext<'gc>,
+        proto: Option<Value<'gc>>,
+        native: NativeObject<'gc>,
+    ) -> Self {
         let object = Self(Gc::new(
             context.gc(),
             RefLock::new(ObjectData {
-                native: NativeObject::None,
+                native,
                 properties: PropertyMap::new(),
                 interfaces: None,
                 watchers: PropertyMap::new(),
@@ -125,23 +141,13 @@ impl<'gc> Object<'gc> {
             object.define_value(
                 context.gc(),
                 istr!(context, "__proto__"),
-                proto.into(),
+                proto,
                 Attribute::DONT_ENUM | Attribute::DONT_DELETE,
             );
         }
         object
     }
 
-    pub fn new_with_native(
-        context: &StringContext<'gc>,
-        proto: Option<Object<'gc>>,
-        native: NativeObject<'gc>,
-    ) -> Self {
-        let obj = Self::new(context, proto);
-        obj.set_native(context.gc(), native);
-        obj
-    }
-
     // Creates a Object, without assigning any __proto__ property.
     pub fn new_without_proto(gc_context: &Mutation<'gc>) -> Self {
         Self(Gc::new(