avm1: Ignore primitives in __resolve logic.

See the added test-cases in `avm1/object_resolve.`

Author: moulins

core/src/avm1/object.rs

@@ -452,8 +452,10 @@ pub fn find_resolve_method<'gc>(
             return Err(Error::PrototypeRecursionLimit);
         }
 
-        if let Some(value) = p.get_local_stored(istr!("__resolve"), activation, false) {
-            return Ok(Some(value.coerce_to_object(activation)));
+        let resolve = p.get_local_stored(istr!("__resolve"), activation, false);
+        // FP completely skips over primitives (but not over non-function objects).
+        if let Some(Value::Object(value)) = resolve {
+            return Ok(Some(value));
         }
 
         proto = p.proto(activation);

tests/tests/swfs/avm1/object_resolve/Test.as

@@ -54,6 +54,18 @@ class Test {
 
     trace("");
 
+    trace("// object.__resolve = 42");
+    object.__resolve = 42;
+    trace("object.object: " + object.object);
+    trace("// object.__resolve = _root");
+    object.__resolve = _root;
+    trace("object.object: " + object.object);
+    trace("// object.__resolve = {}");
+    object.__resolve = {};
+    trace("object.object: " + object.object);
+
+    trace("");
+
     object = {};
     object.addProperty("__resolve", function() {return function() {return "resolved!";}}, null);
     trace("object.foo with an addProperty __resolve: " + object.foo);

tests/tests/swfs/avm1/object_resolve/output.txt

@@ -26,4 +26,13 @@ object.function: [type Function]
 object.function(): undefined
 object.hasOwnProperty("function"): false
 
+// object.__resolve = 42
+// Proto.prototype.__resolve function called!
+object.object: [object Object]
+// object.__resolve = _root
+// Proto.prototype.__resolve function called!
+object.object: [object Object]
+// object.__resolve = {}
+object.object: undefined
+
 object.foo with an addProperty __resolve: undefined