From 4c41f8ee075d9cabb67a41272495c5d4da8af98c Mon Sep 17 00:00:00 2001
From: kisbg <kisbg@inf.u-szeged.hu>
Date: Mon, 11 Jan 2021 11:31:27 +0100
Subject: [PATCH] Add proxy and bound function support for GetRealm
 method(#4407)

ecma_op_function_get_function_realm now can process proxy and bound functions.

JerryScript-DCO-1.0-Signed-off-by: bence gabor kis kisbg@inf.u-szeged.hu
---
 .../ecma/operations/ecma-function-object.c    | 56 +++++++++++++------
 tests/test262-esnext-excludelist.xml          |  4 --
 2 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/jerry-core/ecma/operations/ecma-function-object.c b/jerry-core/ecma/operations/ecma-function-object.c
index 117ca7c7d..ebb985761 100644
--- a/jerry-core/ecma/operations/ecma-function-object.c
+++ b/jerry-core/ecma/operations/ecma-function-object.c
@@ -796,25 +796,47 @@ ecma_op_function_get_realm (const ecma_compiled_code_t *bytecode_header_p) /**<
 ecma_global_object_t *
 ecma_op_function_get_function_realm (ecma_object_t *func_obj_p) /**< function object */
 {
-  if (ecma_get_object_type (func_obj_p) == ECMA_OBJECT_TYPE_FUNCTION)
+  while (true)
   {
-    ecma_extended_object_t *ext_function_obj_p = (ecma_extended_object_t *) func_obj_p;
-    const ecma_compiled_code_t *bytecode_data_p = ecma_op_function_get_compiled_code (ext_function_obj_p);
-    return ecma_op_function_get_realm (bytecode_data_p);
+    if (ecma_get_object_type (func_obj_p) == ECMA_OBJECT_TYPE_FUNCTION)
+    {
+      ecma_extended_object_t *ext_function_obj_p = (ecma_extended_object_t *) func_obj_p;
+      const ecma_compiled_code_t *bytecode_data_p = ecma_op_function_get_compiled_code (ext_function_obj_p);
+      return ecma_op_function_get_realm (bytecode_data_p);
+    }
+
+    if (ecma_get_object_type (func_obj_p) == ECMA_OBJECT_TYPE_NATIVE_FUNCTION)
+    {
+      if (ecma_get_object_is_builtin (func_obj_p))
+      {
+        ecma_extended_object_t *ext_function_obj_p = (ecma_extended_object_t *) func_obj_p;
+        return ECMA_GET_INTERNAL_VALUE_POINTER (ecma_global_object_t,
+                                                ext_function_obj_p->u.built_in.realm_value);
+      }
+      ecma_native_function_t *native_function_p = (ecma_native_function_t *) func_obj_p;
+      return ECMA_GET_INTERNAL_VALUE_POINTER (ecma_global_object_t,
+                                              native_function_p->realm_value);
+    }
+
+  #if ENABLED (JERRY_BUILTIN_PROXY)
+    if (ECMA_OBJECT_IS_PROXY (func_obj_p))
+    {
+      ecma_proxy_object_t *proxy_obj_p = (ecma_proxy_object_t *) func_obj_p;
+      if (ecma_is_value_null (proxy_obj_p->handler))
+      {
+        ecma_raise_type_error (ECMA_ERR_MSG ("Prototype from revoked Proxy is invalid."));
+        return NULL;
+      }
+      func_obj_p = ecma_get_object_from_value (proxy_obj_p->target);
+      continue;
+    }
+  #endif /* ENABLED (JERRY_BUILTIN_PROXY) */
+
+    JERRY_ASSERT (ecma_get_object_type (func_obj_p) == ECMA_OBJECT_TYPE_BOUND_FUNCTION);
+    ecma_bound_function_t *bound_func_p = (ecma_bound_function_t *) func_obj_p;
+    func_obj_p = ECMA_GET_NON_NULL_POINTER_FROM_POINTER_TAG (ecma_object_t,
+                                                             bound_func_p->header.u.bound_function.target_function);
   }
-
-  JERRY_ASSERT (ecma_get_object_type (func_obj_p) == ECMA_OBJECT_TYPE_NATIVE_FUNCTION);
-
-  if (ecma_get_object_is_builtin (func_obj_p))
-  {
-    ecma_extended_object_t *ext_function_obj_p = (ecma_extended_object_t *) func_obj_p;
-    return ECMA_GET_INTERNAL_VALUE_POINTER (ecma_global_object_t,
-                                            ext_function_obj_p->u.built_in.realm_value);
-  }
-
-  ecma_native_function_t *native_function_p = (ecma_native_function_t *) func_obj_p;
-  return ECMA_GET_INTERNAL_VALUE_POINTER (ecma_global_object_t,
-                                          native_function_p->realm_value);
 } /* ecma_op_function_get_function_realm */
 
 #endif /* ENABLED (JERRY_BUILTIN_REALMS) */
diff --git a/tests/test262-esnext-excludelist.xml b/tests/test262-esnext-excludelist.xml
index 8a7972bed..a18ff17c4 100644
--- a/tests/test262-esnext-excludelist.xml
+++ b/tests/test262-esnext-excludelist.xml
@@ -9646,8 +9646,6 @@
   <test id="built-ins/FinalizationRegistry/gc-has-one-chance-to-call-cleanupCallback.js"><reason></reason></test>
   <test id="built-ins/FinalizationRegistry/proto-from-ctor-realm.js"><reason></reason></test>
   <test id="built-ins/Function/internals/Call/class-ctor-realm.js"><reason></reason></test>
-  <test id="built-ins/Function/prototype/bind/get-fn-realm-recursive.js"><reason></reason></test>
-  <test id="built-ins/Function/prototype/bind/get-fn-realm.js"><reason></reason></test>
   <test id="built-ins/NativeErrors/AggregateError/proto-from-ctor-realm.js"><reason></reason></test>
   <test id="built-ins/NativeErrors/EvalError/proto-from-ctor-realm.js"><reason></reason></test>
   <test id="built-ins/NativeErrors/RangeError/proto-from-ctor-realm.js"><reason></reason></test>
@@ -9655,8 +9653,6 @@
   <test id="built-ins/NativeErrors/SyntaxError/proto-from-ctor-realm.js"><reason></reason></test>
   <test id="built-ins/NativeErrors/TypeError/proto-from-ctor-realm.js"><reason></reason></test>
   <test id="built-ins/NativeErrors/URIError/proto-from-ctor-realm.js"><reason></reason></test>
-  <test id="built-ins/Proxy/get-fn-realm-recursive.js"><reason></reason></test>
-  <test id="built-ins/Proxy/get-fn-realm.js"><reason></reason></test>
   <test id="built-ins/RegExp/prototype/dotAll/cross-realm.js"><reason></reason></test>
   <test id="built-ins/RegExp/prototype/global/cross-realm.js"><reason></reason></test>
   <test id="built-ins/RegExp/prototype/ignoreCase/cross-realm.js"><reason></reason></test>