Implement this binding for arrow functions.

JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg [email protected]

Author: zherczeg

jerry-core/ecma/base/ecma-alloc.c

@@ -131,14 +131,14 @@ ecma_alloc_extended_object (size_t size) /**< size of object */
  * Dealloc memory of an extended object
  */
 inline void __attr_always_inline___
-ecma_dealloc_extended_object (ecma_extended_object_t *ext_object_p, /**< property pair to be freed */
+ecma_dealloc_extended_object (ecma_object_t *object_p, /**< extended object */
                               size_t size) /**< size of object */
 {
 #ifdef JMEM_STATS
   jmem_stats_free_object_bytes (size);
 #endif /* JMEM_STATS */
 
-  jmem_heap_free_block (ext_object_p, size);
+  jmem_heap_free_block (object_p, size);
 } /* ecma_dealloc_extended_object */
 
 /**

jerry-core/ecma/base/ecma-alloc.h

@@ -47,7 +47,7 @@ ecma_extended_object_t *ecma_alloc_extended_object (size_t size);
 /**
  * Dealloc memory of an extended object
  */
-void ecma_dealloc_extended_object (ecma_extended_object_t *ext_object_p, size_t size);
+void ecma_dealloc_extended_object (ecma_object_t *object_p, size_t size);
 
 /**
  * Allocate memory for ecma-number

jerry-core/ecma/base/ecma-gc.c

@@ -348,13 +348,26 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */
         {
           ecma_extended_object_t *ext_func_p = (ecma_extended_object_t *) object_p;
 
-          ecma_object_t *scope_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_object_t,
-                                                                    ext_func_p->u.function.scope_cp);
+          ecma_gc_set_object_visited (ECMA_GET_INTERNAL_VALUE_POINTER (ecma_object_t,
+                                                                       ext_func_p->u.function.scope_cp));
+        }
+        break;
+      }
+#ifndef CONFIG_DISABLE_ES2015_ARROW_FUNCTION
+      case ECMA_OBJECT_TYPE_ARROW_FUNCTION:
+      {
+        ecma_arrow_function_t *arrow_func_p = (ecma_arrow_function_t *) object_p;
 
-          ecma_gc_set_object_visited (scope_p);
+        ecma_gc_set_object_visited (ECMA_GET_NON_NULL_POINTER (ecma_object_t,
+                                                               arrow_func_p->scope_cp));
+
+        if (ecma_is_value_object (arrow_func_p->this_binding))
+        {
+          ecma_gc_set_object_visited (ecma_get_object_from_value (arrow_func_p->this_binding));
         }
         break;
       }
+#endif /* !CONFIG_DISABLE_ES2015_ARROW_FUNCTION */
       default:
       {
         break;
@@ -554,7 +567,7 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */
         {
           ecma_length_t arraybuffer_length = ext_object_p->u.class_prop.u.length;
           size_t size = sizeof (ecma_extended_object_t) + arraybuffer_length;
-          ecma_dealloc_extended_object ((ecma_extended_object_t *) object_p, size);
+          ecma_dealloc_extended_object (object_p, size);
           return;
         }
 
@@ -565,7 +578,7 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */
           ecma_free_value_if_not_object (ext_object_p->u.class_prop.u.value);
           ecma_free_values_collection (((ecma_promise_object_t *) object_p)->fulfill_reactions, false);
           ecma_free_values_collection (((ecma_promise_object_t *) object_p)->reject_reactions, false);
-          ecma_dealloc_extended_object ((ecma_extended_object_t *) object_p, sizeof (ecma_promise_object_t));
+          ecma_dealloc_extended_object (object_p, sizeof (ecma_promise_object_t));
           return;
         }
 #endif /* !CONFIG_DISABLE_ES2015_PROMISE_BUILTIN */
@@ -576,15 +589,15 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */
         }
       }
 
-      ecma_dealloc_extended_object ((ecma_extended_object_t *) object_p, ext_object_size);
+      ecma_dealloc_extended_object (object_p, ext_object_size);
       return;
     }
 
     if (ecma_get_object_is_builtin (object_p)
         || object_type == ECMA_OBJECT_TYPE_ARRAY
         || object_type == ECMA_OBJECT_TYPE_EXTERNAL_FUNCTION)
     {
-      ecma_dealloc_extended_object ((ecma_extended_object_t *) object_p, ext_object_size);
+      ecma_dealloc_extended_object (object_p, ext_object_size);
       return;
     }
 
@@ -596,9 +609,24 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */
       ecma_bytecode_deref (ECMA_GET_INTERNAL_VALUE_POINTER (ecma_compiled_code_t,
                                                             ext_func_p->u.function.bytecode_cp));
 
-      ecma_dealloc_extended_object (ext_func_p, sizeof (ecma_extended_object_t));
+      ecma_dealloc_extended_object (object_p, sizeof (ecma_extended_object_t));
+      return;
+    }
+
+#ifndef CONFIG_DISABLE_ES2015_ARROW_FUNCTION
+    if (object_type == ECMA_OBJECT_TYPE_ARROW_FUNCTION)
+    {
+      ecma_arrow_function_t *arrow_func_p = (ecma_arrow_function_t *) object_p;
+
+      ecma_bytecode_deref (ECMA_GET_NON_NULL_POINTER (ecma_compiled_code_t,
+                                                      arrow_func_p->bytecode_cp));
+
+      ecma_free_value_if_not_object (arrow_func_p->this_binding);
+
+      ecma_dealloc_extended_object (object_p, sizeof (ecma_arrow_function_t));
       return;
     }
+#endif /* !CONFIG_DISABLE_ES2015_ARROW_FUNCTION */
 
     if (object_type == ECMA_OBJECT_TYPE_PSEUDO_ARRAY)
     {
@@ -621,20 +649,18 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */
           }
 
           size_t formal_params_size = formal_params_number * sizeof (jmem_cpointer_t);
-          ecma_dealloc_extended_object (ext_object_p, sizeof (ecma_extended_object_t) + formal_params_size);
+          ecma_dealloc_extended_object (object_p, sizeof (ecma_extended_object_t) + formal_params_size);
           return;
         }
 #ifndef CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN
         case ECMA_PSEUDO_ARRAY_TYPEDARRAY:
         {
-          ecma_dealloc_extended_object ((ecma_extended_object_t *) object_p,
-                                        sizeof (ecma_extended_object_t));
+          ecma_dealloc_extended_object (object_p, sizeof (ecma_extended_object_t));
           return;
         }
         case ECMA_PSEUDO_ARRAY_TYPEDARRAY_WITH_INFO:
         {
-          ecma_dealloc_extended_object ((ecma_extended_object_t *) object_p,
-                                        sizeof (ecma_extended_typedarray_object_t));
+          ecma_dealloc_extended_object (object_p, sizeof (ecma_extended_typedarray_object_t));
           return;
         }
 #endif /* !CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN */
@@ -657,7 +683,7 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */
       if (!ecma_is_value_integer_number (args_len_or_this))
       {
         ecma_free_value_if_not_object (args_len_or_this);
-        ecma_dealloc_extended_object (ext_function_p, sizeof (ecma_extended_object_t));
+        ecma_dealloc_extended_object (object_p, sizeof (ecma_extended_object_t));
         return;
       }
 
@@ -670,7 +696,7 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */
       }
 
       size_t args_size = ((size_t) args_length) * sizeof (ecma_value_t);
-      ecma_dealloc_extended_object (ext_function_p, sizeof (ecma_extended_object_t) + args_size);
+      ecma_dealloc_extended_object (object_p, sizeof (ecma_extended_object_t) + args_size);
       return;
     }
   }

jerry-core/ecma/base/ecma-globals.h

@@ -574,18 +574,20 @@ typedef enum
  */
 typedef enum
 {
-  ECMA_OBJECT_TYPE_GENERAL = 0, /**< all objects that are not String (15.5),
-                                 *   Function (15.3), Arguments (10.6), Array (15.4) objects */
+  ECMA_OBJECT_TYPE_GENERAL = 0, /**< all objects that are not belongs to the sub-types below. */
   ECMA_OBJECT_TYPE_CLASS = 1, /**< Objects with class property */
   ECMA_OBJECT_TYPE_FUNCTION = 2, /**< Function objects (15.3), created through 13.2 routine */
   ECMA_OBJECT_TYPE_EXTERNAL_FUNCTION = 3, /**< External (host) function object */
   ECMA_OBJECT_TYPE_ARRAY = 4, /**< Array object (15.4) */
   ECMA_OBJECT_TYPE_BOUND_FUNCTION = 5, /**< Function objects (15.3), created through 15.3.4.5 routine */
   ECMA_OBJECT_TYPE_PSEUDO_ARRAY  = 6, /**< Array-like object, such as Arguments object (10.6) */
+#ifndef CONFIG_DISABLE_ES2015_ARROW_FUNCTION
+  ECMA_OBJECT_TYPE_ARROW_FUNCTION = 7, /**< arrow function objects */
+#endif /* !CONFIG_DISABLE_ES2015_ARROW_FUNCTION */
 
   /* Types between 13-15 cannot have a built-in flag. See ecma_lexical_environment_type_t. */
 
-  ECMA_OBJECT_TYPE__MAX = ECMA_OBJECT_TYPE_PSEUDO_ARRAY /**< maximum value */
+  ECMA_OBJECT_TYPE__MAX /**< maximum value */
 } ecma_object_type_t;
 
 /**
@@ -777,6 +779,21 @@ typedef struct
   ecma_built_in_props_t built_in; /**< built-in object part */
 } ecma_extended_built_in_object_t;
 
+#ifndef CONFIG_DISABLE_ES2015_ARROW_FUNCTION
+
+/**
+ * Description of arrow function objects.
+ */
+typedef struct
+{
+  ecma_object_t object; /**< object header */
+  ecma_value_t this_binding; /**< value of 'this' binding */
+  jmem_cpointer_t scope_cp; /**< function scope */
+  jmem_cpointer_t bytecode_cp; /**< function byte code */
+} ecma_arrow_function_t;
+
+#endif /* !CONFIG_DISABLE_ES2015_ARROW_FUNCTION */
+
 /**
  * Description of ECMA property descriptor
  *

jerry-core/ecma/base/ecma-helpers.c

@@ -45,7 +45,7 @@ JERRY_STATIC_ASSERT (ECMA_PROPERTY_TYPE_MASK >= ECMA_PROPERTY_TYPE__MAX,
 /**
  * The ecma object types must be lower than the container mask.
  */
-JERRY_STATIC_ASSERT (ECMA_OBJECT_TYPE_MASK >= ECMA_OBJECT_TYPE__MAX,
+JERRY_STATIC_ASSERT (ECMA_OBJECT_TYPE_MASK >= ECMA_OBJECT_TYPE__MAX - 1,
                      ecma_object_types_must_be_lower_than_the_container_mask);
 
 /**