Fixing retrieval of [[Class]] properties for built-in function objects, optimizing memory related to [[Class]] property.

 - introduced ecma_object_get_class_name interface;
 - removed creation of [[Class]] internal property for types of objects that unambiguously determine the [[Class]] value.

Related issue: #112

JerryScript-DCO-1.0-Signed-off-by: Ruben Ayrapetyan [email protected]

Author: ruben-ayrapetyan

jerry-core/ecma/builtin-objects/ecma-builtin-array-prototype.cpp

@@ -139,7 +139,7 @@ ecma_builtin_array_prototype_object_concat (ecma_value_t this_arg, /**< this arg
   {
     /* 5.b */
     if (ecma_is_value_object (args[arg_index]) &&
-        (ecma_get_object_type (ecma_get_object_from_value (args[arg_index])) == ECMA_OBJECT_TYPE_ARRAY))
+        (ecma_object_get_class_name (ecma_get_object_from_value (args[arg_index])) == ECMA_MAGIC_STRING_ARRAY_UL))
     {
       /* 5.b.ii */
       ECMA_TRY_CATCH (arg_len_value,

jerry-core/ecma/builtin-objects/ecma-builtin-array.cpp

@@ -63,10 +63,7 @@ ecma_builtin_array_object_is_array (ecma_value_t this_arg __attr_unused___, /**<
   {
     ecma_object_t *obj_p = ecma_get_object_from_value (arg);
 
-    ecma_property_t *class_prop_p = ecma_get_internal_property (obj_p,
-                                                                ECMA_INTERNAL_PROPERTY_CLASS);
-
-    if (class_prop_p->u.internal_property.value == ECMA_MAGIC_STRING_ARRAY_UL)
+    if (ecma_object_get_class_name (obj_p) == ECMA_MAGIC_STRING_ARRAY_UL)
     {
       is_array = ECMA_SIMPLE_VALUE_TRUE;
     }

jerry-core/ecma/builtin-objects/ecma-builtin-boolean-prototype.cpp

@@ -102,9 +102,7 @@ ecma_builtin_boolean_prototype_object_value_of (ecma_value_t this_arg) /**< this
   {
     ecma_object_t *obj_p = ecma_get_object_from_value (this_arg);
 
-    ecma_property_t *class_prop_p = ecma_get_internal_property (obj_p, ECMA_INTERNAL_PROPERTY_CLASS);
-
-    if (class_prop_p->u.internal_property.value == ECMA_MAGIC_STRING_BOOLEAN_UL)
+    if (ecma_object_get_class_name (obj_p) == ECMA_MAGIC_STRING_BOOLEAN_UL)
     {
       ecma_property_t *prim_value_prop_p = ecma_get_internal_property (obj_p,
                                                                        ECMA_INTERNAL_PROPERTY_PRIMITIVE_BOOLEAN_VALUE);

jerry-core/ecma/builtin-objects/ecma-builtin-helpers.cpp

@@ -71,9 +71,7 @@ ecma_builtin_helper_object_to_string (const ecma_value_t this_arg) /**< this arg
 
     ecma_object_t *obj_p = ecma_get_object_from_completion_value (obj_this);
 
-    ecma_property_t *class_prop_p = ecma_get_internal_property (obj_p,
-                                                                ECMA_INTERNAL_PROPERTY_CLASS);
-    type_string = (ecma_magic_string_id_t) class_prop_p->u.internal_property.value;
+    type_string = ecma_object_get_class_name (obj_p);
 
     ecma_free_completion_value (obj_this);
   }

jerry-core/ecma/builtin-objects/ecma-builtin-number-prototype.cpp

@@ -70,9 +70,7 @@ ecma_builtin_number_prototype_object_to_string (ecma_value_t this_arg, /**< this
   {
     ecma_object_t *obj_p = ecma_get_object_from_value (this_arg);
 
-    ecma_property_t *class_prop_p = ecma_get_internal_property (obj_p, ECMA_INTERNAL_PROPERTY_CLASS);
-
-    if (class_prop_p->u.internal_property.value == ECMA_MAGIC_STRING_NUMBER_UL)
+    if (ecma_object_get_class_name (obj_p) == ECMA_MAGIC_STRING_NUMBER_UL)
     {
       ecma_property_t *prim_value_prop_p = ecma_get_internal_property (obj_p,
                                                                        ECMA_INTERNAL_PROPERTY_PRIMITIVE_NUMBER_VALUE);
@@ -137,9 +135,7 @@ ecma_builtin_number_prototype_object_value_of (ecma_value_t this_arg) /**< this
   {
     ecma_object_t *obj_p = ecma_get_object_from_value (this_arg);
 
-    ecma_property_t *class_prop_p = ecma_get_internal_property (obj_p, ECMA_INTERNAL_PROPERTY_CLASS);
-
-    if (class_prop_p->u.internal_property.value == ECMA_MAGIC_STRING_NUMBER_UL)
+    if (ecma_object_get_class_name (obj_p) == ECMA_MAGIC_STRING_NUMBER_UL)
     {
       ecma_property_t *prim_value_prop_p = ecma_get_internal_property (obj_p,
                                                                        ECMA_INTERNAL_PROPERTY_PRIMITIVE_NUMBER_VALUE);

jerry-core/ecma/builtin-objects/ecma-builtin-string-prototype.cpp

@@ -64,9 +64,7 @@ ecma_builtin_string_prototype_object_to_string (ecma_value_t this_arg) /**< this
   {
     ecma_object_t *obj_p = ecma_get_object_from_value (this_arg);
 
-    ecma_property_t *class_prop_p = ecma_get_internal_property (obj_p, ECMA_INTERNAL_PROPERTY_CLASS);
-
-    if (class_prop_p->u.internal_property.value == ECMA_MAGIC_STRING_STRING_UL)
+    if (ecma_object_get_class_name (obj_p) == ECMA_MAGIC_STRING_STRING_UL)
     {
       ecma_property_t *prim_value_prop_p = ecma_get_internal_property (obj_p,
                                                                        ECMA_INTERNAL_PROPERTY_PRIMITIVE_STRING_VALUE);

jerry-core/ecma/builtin-objects/ecma-builtins-internal.h

@@ -57,7 +57,6 @@ ecma_builtin_bin_search_for_magic_string_id_in_array (const ecma_magic_string_id
 
 #define BUILTIN(builtin_id, \
                 object_type, \
-                object_class, \
                 object_prototype_builtin_id, \
                 is_extensible, \
                 is_static, \

jerry-core/ecma/builtin-objects/ecma-builtins.cpp

@@ -54,12 +54,16 @@ ecma_builtin_is (ecma_object_t *obj_p, /**< pointer to an object */
   JERRY_ASSERT (obj_p != NULL && !ecma_is_lexical_environment (obj_p));
   JERRY_ASSERT (builtin_id < ECMA_BUILTIN_ID__COUNT);
 
-  if (unlikely (ecma_builtin_objects[builtin_id] == NULL))
+  if (ecma_builtin_objects[builtin_id] == NULL)
   {
-    ecma_instantiate_builtin (builtin_id);
+    /* If a built-in object is not instantiated,
+     * the specified object cannot be the built-in object */
+    return false;
+  }
+  else
+  {
+    return (obj_p == ecma_builtin_objects[builtin_id]);
   }
-
-  return (obj_p == ecma_builtin_objects[builtin_id]);
 } /* ecma_builtin_is */
 
 /**
@@ -94,14 +98,15 @@ static ecma_object_t*
 ecma_builtin_init_object (ecma_builtin_id_t obj_builtin_id, /**< built-in ID */
                           ecma_object_t* prototype_obj_p, /**< prototype object */
                           ecma_object_type_t obj_type, /**< object's type */
-                          ecma_magic_string_id_t obj_class, /**< object's class */
                           bool is_extensible) /**< value of object's [[Extensible]] property */
 {
   ecma_object_t *object_obj_p = ecma_create_object (prototype_obj_p, is_extensible, obj_type);
 
-  ecma_property_t *class_prop_p = ecma_create_internal_property (object_obj_p,
-                                                                 ECMA_INTERNAL_PROPERTY_CLASS);
-  class_prop_p->u.internal_property.value = obj_class;
+  /*
+   * [[Class]] property of built-in object is not stored explicitly.
+   *
+   * See also: ecma_object_get_class_name
+   */
 
   ecma_property_t *built_in_id_prop_p = ecma_create_internal_property (object_obj_p,
                                                                        ECMA_INTERNAL_PROPERTY_BUILT_IN_ID);
@@ -183,7 +188,6 @@ ecma_instantiate_builtin (ecma_builtin_id_t id) /**< built-in id */
   {
 #define BUILTIN(builtin_id, \
                 object_type, \
-                object_class, \
                 object_prototype_builtin_id, \
                 is_extensible, \
                 is_static, \
@@ -211,11 +215,10 @@ ecma_instantiate_builtin (ecma_builtin_id_t id) /**< built-in id */
         JERRY_ASSERT (prototype_obj_p != NULL); \
       } \
       \
-      ecma_object_t *builtin_obj_p =  ecma_builtin_init_object (builtin_id, \
-                                                                prototype_obj_p, \
-                                                                object_type, \
-                                                                object_class, \
-                                                                is_extensible); \
+      ecma_object_t *builtin_obj_p = ecma_builtin_init_object (builtin_id, \
+                                                               prototype_obj_p, \
+                                                               object_type, \
+                                                               is_extensible); \
       ecma_builtin_objects[builtin_id] = builtin_obj_p; \
       \
       break; \
@@ -274,7 +277,6 @@ ecma_builtin_try_to_instantiate_property (ecma_object_t *object_p, /**< object *
   {
 #define BUILTIN(builtin_id, \
                 object_type, \
-                object_class, \
                 object_prototype_builtin_id, \
                 is_extensible, \
                 is_static, \
@@ -411,7 +413,6 @@ ecma_builtin_dispatch_call (ecma_object_t *obj_p, /**< built-in object */
     {
 #define BUILTIN(builtin_id, \
                 object_type, \
-                object_class, \
                 object_prototype_builtin_id, \
                 is_extensible, \
                 is_static, \
@@ -474,7 +475,6 @@ ecma_builtin_dispatch_construct (ecma_object_t *obj_p, /**< built-in object */
   {
 #define BUILTIN(builtin_id, \
                 object_type, \
-                object_class, \
                 object_prototype_builtin_id, \
                 is_extensible, \
                 is_static, \
@@ -530,7 +530,6 @@ ecma_builtin_dispatch_routine (ecma_builtin_id_t builtin_object_id, /**< built-i
   {
 #define BUILTIN(builtin_id, \
                 object_type, \
-                object_class, \
                 object_prototype_builtin_id, \
                 is_extensible, \
                 is_static, \

jerry-core/ecma/builtin-objects/ecma-builtins.h

@@ -25,7 +25,6 @@ typedef enum
 {
 #define BUILTIN(builtin_id, \
                 object_type, \
-                object_class, \
                 object_prototype_builtin_id, \
                 is_extensible, \
                 is_static, \