Implement function.name

JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik [email protected]

Author: rerobika

jerry-core/api/jerry-snapshot.c

@@ -761,6 +761,13 @@ jerry_generate_snapshot_with_args (const jerry_char_t *resource_name_p, /**< scr
   globals.regex_found = false;
   globals.class_found = false;
 
+  uint32_t status_flags = ECMA_PARSE_SNAPSHOT;
+
+  if (generate_snapshot_opts & JERRY_SNAPSHOT_SAVE_STRICT)
+  {
+    status_flags |= ECMA_PARSE_STRICT_MODE;
+  }
+
   parse_status = parser_parse_script (args_p,
                                       args_size,
                                       source_p,

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

@@ -128,6 +128,7 @@ typedef enum
    */
   ECMA_PARSE_INTERNAL_FOR_IN_OFF_CONTEXT_ERROR = (1u << 9),
 #endif /* !JERRY_NDEBUG */
+  ECMA_PARSE_SNAPSHOT = (1u << 10), /**< script parsing is called by the snapshot tool */
 } ecma_parse_opts_t;
 
 /**
@@ -206,6 +207,7 @@ enum
   ECMA_VALUE_UNINITIALIZED = ECMA_MAKE_VALUE (10), /**< a special value for uninitialized let/const declarations */
   ECMA_VALUE_SPREAD_ELEMENT = ECMA_MAKE_VALUE (11), /**< a special value for spread elements in array initialization
                                                      *   or function call argument list */
+  ECMA_VALUE_ANONYMOUS = ECMA_MAKE_VALUE (12), /**< represents anonymous function declaration */
 };
 
 #if !ENABLED (JERRY_NUMBER_TYPE_FLOAT64)

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

@@ -1439,19 +1439,17 @@ ecma_bytecode_deref (ecma_compiled_code_t *bytecode_p) /**< byte code pointer */
 #endif /* ENABLED (JERRY_DEBUGGER) */
 
 #if ENABLED (JERRY_ES2015)
-    if (bytecode_p->status_flags & CBC_CODE_FLAG_HAS_TAGGED_LITERALS)
-    {
-      ecma_length_t formal_params_number = ecma_compiled_code_get_formal_params (bytecode_p);
 
-      uint8_t *byte_p = (uint8_t *) bytecode_p;
-      byte_p += ((size_t) bytecode_p->size) << JMEM_ALIGNMENT_LOG;
+    ecma_value_t *base_p = ecma_compiled_code_resolve_arguments_start (bytecode_p);
 
-      ecma_value_t *tagged_base_p = (ecma_value_t *) byte_p;
-      tagged_base_p -= formal_params_number;
-
-      ecma_collection_t *coll_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_collection_t, tagged_base_p[-1]);
+    if (!(bytecode_p->status_flags & CBC_CODE_FLAGS_CLASS_CONSTRUCTOR))
+    {
+      ecma_free_value (*(--base_p));
+    }
 
-      ecma_collection_destroy (coll_p);
+    if (bytecode_p->status_flags & CBC_CODE_FLAG_HAS_TAGGED_LITERALS)
+    {
+      ecma_collection_destroy (ECMA_GET_INTERNAL_VALUE_POINTER (ecma_collection_t, base_p[-1]));
     }
 #endif /* ENABLED (JERRY_ES2015) */
 
@@ -1484,11 +1482,12 @@ ecma_compiled_code_get_tagged_template_collection (const ecma_compiled_code_t *b
   JERRY_ASSERT (bytecode_header_p != NULL);
   JERRY_ASSERT (bytecode_header_p->status_flags & CBC_CODE_FLAG_HAS_TAGGED_LITERALS);
 
-  uint8_t *byte_p = (uint8_t *) bytecode_header_p;
-  byte_p += ((size_t) bytecode_header_p->size) << JMEM_ALIGNMENT_LOG;
+  ecma_value_t *tagged_base_p = ecma_compiled_code_resolve_arguments_start (bytecode_header_p);
 
-  ecma_value_t *tagged_base_p = (ecma_value_t *) byte_p;
-  tagged_base_p -= ecma_compiled_code_get_formal_params (bytecode_header_p);
+  if (!(bytecode_header_p->status_flags & CBC_CODE_FLAGS_CLASS_CONSTRUCTOR))
+  {
+    tagged_base_p--;
+  }
 
   return ECMA_GET_INTERNAL_VALUE_POINTER (ecma_collection_t, tagged_base_p[-1]);
 } /* ecma_compiled_code_get_tagged_template_collection */
@@ -1515,6 +1514,34 @@ ecma_compiled_code_get_formal_params (const ecma_compiled_code_t *bytecode_heade
 
   return ((cbc_uint8_arguments_t *) bytecode_header_p)->argument_end;
 } /* ecma_compiled_code_get_formal_params */
+
+/**
+ * Resolve the position of the arguments list start of the compiled code
+ *
+ * @return start position of the arguments list start of the compiled code
+ */
+ecma_value_t *
+ecma_compiled_code_resolve_arguments_start (const ecma_compiled_code_t *bytecode_header_p)
+{
+  JERRY_ASSERT (bytecode_header_p != NULL);
+
+  uint8_t *byte_p = (uint8_t *) bytecode_header_p;
+  byte_p += ((size_t) bytecode_header_p->size) << JMEM_ALIGNMENT_LOG;
+
+  return ((ecma_value_t *) byte_p) - ecma_compiled_code_get_formal_params (bytecode_header_p);
+} /* ecma_compiled_code_resolve_arguments_start */
+
+/**
+ * Resolve the position of the function name of the compiled code
+ *
+ * @return position of the function name of the compiled code
+ */
+inline ecma_value_t * JERRY_ATTR_ALWAYS_INLINE
+ecma_compiled_code_resolve_function_name (const ecma_compiled_code_t *bytecode_header_p)
+{
+  JERRY_ASSERT (bytecode_header_p != NULL);
+  return ecma_compiled_code_resolve_arguments_start (bytecode_header_p) - 1;
+} /* ecma_compiled_code_resolve_function_name */
 #endif /* ENABLED (JERRY_LINE_INFO) || ENABLED (JERRY_ES2015_MODULE_SYSTEM) || ENABLED (JERRY_ES2015) */
 
 #if (JERRY_STACK_LIMIT != 0)

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

@@ -490,6 +490,8 @@ ecma_collection_t *ecma_compiled_code_get_tagged_template_collection (const ecma
 #endif /* ENABLED (JERRY_ES2015) */
 #if ENABLED (JERRY_LINE_INFO) || ENABLED (JERRY_ES2015_MODULE_SYSTEM) || ENABLED (JERRY_ES2015)
 ecma_length_t ecma_compiled_code_get_formal_params (const ecma_compiled_code_t *bytecode_p);
+ecma_value_t *ecma_compiled_code_resolve_arguments_start (const ecma_compiled_code_t *bytecode_header_p);
+ecma_value_t *ecma_compiled_code_resolve_function_name (const ecma_compiled_code_t *bytecode_header_p);
 #endif /* ENABLED (JERRY_LINE_INFO) || ENABLED (JERRY_ES2015_MODULE_SYSTEM) || ENABLED (JERRY_ES2015) */
 #if (JERRY_STACK_LIMIT != 0)
 uintptr_t ecma_get_current_stack_usage (void);

jerry-core/ecma/builtin-objects/ecma-builtin-function-prototype.c

@@ -297,6 +297,11 @@ ecma_builtin_function_prototype_object_bind (ecma_object_t *this_arg_obj_p , /**
   }
 
 #if ENABLED (JERRY_ES2015)
+  if (prototype_obj_p != NULL)
+  {
+    ecma_deref_object (prototype_obj_p);
+  }
+
   ecma_integer_value_t len = 0;
   ecma_string_t *len_string = ecma_get_magic_string (LIT_MAGIC_STRING_LENGTH);
   ecma_property_descriptor_t prop_desc;
@@ -307,6 +312,7 @@ ecma_builtin_function_prototype_object_bind (ecma_object_t *this_arg_obj_p , /**
 #if ENABLED (JERRY_ES2015_BUILTIN_PROXY)
   if (ECMA_IS_VALUE_ERROR (status))
   {
+    ecma_deref_object (function_p);
     return status;
   }
 #endif /* ENABLED (JERRY_ES2015_BUILTIN_PROXY) */
@@ -319,6 +325,7 @@ ecma_builtin_function_prototype_object_bind (ecma_object_t *this_arg_obj_p , /**
 
     if (ECMA_IS_VALUE_ERROR (len_value))
     {
+      ecma_deref_object (function_p);
       return len_value;
     }
 
@@ -328,14 +335,35 @@ ecma_builtin_function_prototype_object_bind (ecma_object_t *this_arg_obj_p , /**
       ecma_op_to_integer (len_value, &len_num);
       len = (ecma_integer_value_t) len_num;
     }
+    ecma_free_value (len_value);
   }
 
   bound_func_p->target_length = len;
 
-  if (prototype_obj_p != NULL)
+  /* 12. */
+  ecma_value_t name_value = ecma_op_object_get_by_magic_id (this_arg_obj_p, LIT_MAGIC_STRING_NAME);
+  if (ECMA_IS_VALUE_ERROR (name_value))
   {
-    ecma_deref_object (prototype_obj_p);
+    ecma_deref_object (function_p);
+    return name_value;
   }
+
+  ecma_stringbuilder_t builder = ecma_stringbuilder_create_raw ((const lit_utf8_byte_t *) "bound ", 6);
+
+  if (ecma_is_value_string (name_value))
+  {
+    ecma_stringbuilder_append (&builder, ecma_get_string_from_value (name_value));
+  }
+
+  ecma_free_value (name_value);
+
+  ecma_property_value_t *name_prop_value_p;
+  name_prop_value_p = ecma_create_named_data_property (function_p,
+                                                       ecma_get_magic_string (LIT_MAGIC_STRING_NAME),
+                                                       ECMA_PROPERTY_FLAG_CONFIGURABLE,
+                                                       NULL);
+
+  name_prop_value_p->value = ecma_make_string_value (ecma_stringbuilder_finalize (&builder));
 #endif /* ENABLED (JERRY_ES2015) */
 
   /*

jerry-core/ecma/operations/ecma-function-object.c

@@ -25,6 +25,7 @@
 #include "ecma-objects-general.h"
 #include "ecma-objects-arguments.h"
 #include "ecma-proxy-object.h"
+#include "ecma-symbol-object.h"
 #include "ecma-try-catch-macro.h"
 #include "jcontext.h"
 
@@ -46,23 +47,77 @@ ecma_op_resource_name (const ecma_compiled_code_t *bytecode_header_p)
 {
   JERRY_ASSERT (bytecode_header_p != NULL);
 
-  uint8_t *byte_p = (uint8_t *) bytecode_header_p;
-  byte_p += ((size_t) bytecode_header_p->size) << JMEM_ALIGNMENT_LOG;
-
-  ecma_value_t *resource_name_p = (ecma_value_t *) byte_p;
-  resource_name_p -= ecma_compiled_code_get_formal_params (bytecode_header_p);
+  ecma_value_t *base_p = ecma_compiled_code_resolve_arguments_start (bytecode_header_p);
 
 #if ENABLED (JERRY_ES2015)
   if (bytecode_header_p->status_flags & CBC_CODE_FLAG_HAS_TAGGED_LITERALS)
   {
-    resource_name_p--;
+    base_p--;
+  }
+
+  if (!(bytecode_header_p->status_flags & CBC_CODE_FLAGS_CLASS_CONSTRUCTOR))
+  {
+    base_p--;
   }
 #endif /* ENABLED (JERRY_ES2015) */
 
-  return resource_name_p[-1];
+  return base_p[-1];
 } /* ecma_op_resource_name */
 #endif /* ENABLED (JERRY_LINE_INFO) || ENABLED (JERRY_ES2015_MODULE_SYSTEM) */
 
+#if ENABLED (JERRY_ES2015)
+/**
+ * SetFunctionName operation
+ *
+ * See also: ECMAScript v6, 9.2.1.1
+ *
+ * @return resource name as ecma-string
+ */
+ecma_value_t
+ecma_op_function_form_name (ecma_value_t prop_name, /**< property name */
+                            char *prefix_p, /**< prefix */
+                            lit_utf8_size_t prefix_size) /**< prefix length */
+{
+  ecma_string_t *prop_name_p = ecma_get_prop_name_from_value (prop_name);
+
+  /* 4. */
+  if (ecma_prop_name_is_symbol (prop_name_p))
+  {
+    /* .a */
+    ecma_string_t *string_desc_p = ecma_get_symbol_description (prop_name_p);
+
+    /* .b */
+    if (ecma_string_is_empty (string_desc_p))
+    {
+      prop_name_p = string_desc_p;
+    }
+    /* .c */
+    else
+    {
+      ecma_stringbuilder_t builder = ecma_stringbuilder_create_raw ((lit_utf8_byte_t *) "[", 1);
+      ecma_stringbuilder_append (&builder, string_desc_p);
+      ecma_stringbuilder_append_byte (&builder, (lit_utf8_byte_t) LIT_CHAR_RIGHT_SQUARE);
+      prop_name_p = ecma_stringbuilder_finalize (&builder);
+    }
+  }
+  else
+  {
+    ecma_ref_ecma_string (prop_name_p);
+  }
+
+  /* 5. */
+  if (JERRY_UNLIKELY (prefix_p != NULL))
+  {
+    ecma_stringbuilder_t builder = ecma_stringbuilder_create_raw ((lit_utf8_byte_t *) prefix_p, prefix_size);
+    ecma_stringbuilder_append (&builder, prop_name_p);
+    ecma_deref_ecma_string (prop_name_p);
+    prop_name_p = ecma_stringbuilder_finalize (&builder);
+  }
+
+  return ecma_make_string_value (prop_name_p);
+} /* ecma_op_function_form_name */
+#endif /* ENABLED (JERRY_ES2015) */
+
 /**
  * IsCallable operation.
  *
@@ -345,6 +400,12 @@ ecma_op_create_dynamic_function (const ecma_value_t *arguments_list_p, /**< argu
   {
     JERRY_ASSERT (ecma_is_value_true (ret_value));
 
+#if ENABLED (JERRY_ES2015)
+    ecma_value_t *func_name_p;
+    func_name_p = ecma_compiled_code_resolve_function_name ((const ecma_compiled_code_t *) bytecode_data_p);
+    *func_name_p = ecma_make_magic_string_value (LIT_MAGIC_STRING_ANONYMOUS);
+#endif /* ENABLED (JERRY_ES2015) */
+
     ecma_object_t *global_env_p = ecma_get_global_environment ();
     ecma_builtin_id_t fallback_proto = ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE;
 
@@ -1417,6 +1478,34 @@ ecma_op_function_try_to_lazy_instantiate_property (ecma_object_t *object_p, /**<
 
     return NULL;
   }
+
+  if (ecma_compare_ecma_string_to_magic_id (property_name_p, LIT_MAGIC_STRING_NAME))
+  {
+    ecma_extended_object_t *ext_func_p = (ecma_extended_object_t *) object_p;
+    if (!ECMA_GET_SECOND_BIT_FROM_POINTER_TAG (ext_func_p->u.function.scope_cp))
+    {
+      /* Set tag bit to represent initialized 'name' property */
+      ECMA_SET_SECOND_BIT_TO_POINTER_TAG (ext_func_p->u.function.scope_cp);
+      const ecma_compiled_code_t *bytecode_data_p = ecma_op_function_get_compiled_code (ext_func_p);
+
+      ecma_value_t value = *ecma_compiled_code_resolve_function_name (bytecode_data_p);
+      if (value != ECMA_VALUE_ANONYMOUS)
+      {
+        JERRY_ASSERT (ecma_is_value_string (value));
+
+        /* Initialize 'name' property */
+        ecma_property_t *value_prop_p;
+        ecma_property_value_t *value_p = ecma_create_named_data_property (object_p,
+                                                                          property_name_p,
+                                                                          ECMA_PROPERTY_FLAG_CONFIGURABLE,
+                                                                          &value_prop_p);
+        value_p->value = ecma_copy_value (value);
+        return value_prop_p;
+      }
+    }
+
+    return NULL;
+  }
 #endif /* ENABLED (JERRY_ES2015) */
 
   if (ecma_compare_ecma_string_to_magic_id (property_name_p, LIT_MAGIC_STRING_PROTOTYPE)

jerry-core/ecma/operations/ecma-function-object.h

@@ -31,6 +31,10 @@
 ecma_value_t ecma_op_resource_name (const ecma_compiled_code_t *bytecode_header_p);
 #endif /* ENABLED (JERRY_LINE_INFO) || ENABLED (JERRY_ES2015_MODULE_SYSTEM) */
 
+#if ENABLED (JERRY_ES2015)
+ecma_value_t ecma_op_function_form_name (ecma_value_t prop_name, char *prefix_p, lit_utf8_size_t prefix_size);
+#endif /* ENABLED (JERRY_ES2015) */
+
 bool ecma_op_is_callable (ecma_value_t value);
 bool ecma_op_object_is_callable (ecma_object_t *obj_p);
 bool ecma_is_constructor (ecma_value_t value);

jerry-core/lit/lit-magic-strings.inc.h

@@ -589,6 +589,9 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_TYPE_ERROR_UL, "TypeError")
 #endif
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_UNDEFINED_UL, "Undefined")
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING__PROTO__, "__proto__")
+#if ENABLED (JERRY_ES2015)
+LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ANONYMOUS, "anonymous")
+#endif
 LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ARGUMENTS, "arguments")
 #if ENABLED (JERRY_ES2015_BUILTIN_PROXY) \
 || ENABLED (JERRY_ES2015_BUILTIN_REFLECT)

jerry-core/lit/lit-magic-strings.ini

@@ -232,6 +232,7 @@ LIT_MAGIC_STRING_UNESCAPE = "unescape"
 LIT_MAGIC_STRING_WRITABLE = "writable"
 LIT_MAGIC_STRING_NEGATIVE_INFINITY_UL = "-Infinity"
 LIT_MAGIC_STRING_ARGUMENTS_UL = "Arguments"
+LIT_MAGIC_STRING_ANONYMOUS = "anonymous"
 LIT_MAGIC_STRING_CONSTRUCT = "construct"
 LIT_MAGIC_STRING_EVAL_ERROR_UL = "EvalError"
 LIT_MAGIC_STRING_INT8_ARRAY_UL = "Int8Array"