Remove class id storing for class objects (#4645)

The two bytes which stored the id is free to use. Currently the only exception is containers.

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

Author: zherczeg

jerry-core/api/jerry.c

@@ -486,7 +486,6 @@ jerry_parse (const jerry_char_t *source_p, /**< script source */
 
   ecma_extended_object_t *ext_object_p = (ecma_extended_object_t *) object_p;
   ext_object_p->u.cls.type = ECMA_OBJECT_CLASS_SCRIPT;
-  ext_object_p->u.cls.u2.id = LIT_MAGIC_STRING_SCRIPT_UL;
   ECMA_SET_INTERNAL_VALUE_POINTER (ext_object_p->u.cls.u3.value, bytecode_data_p);
 
   return ecma_make_object_value (object_p);
@@ -1254,6 +1253,75 @@ jerry_value_get_type (const jerry_value_t value) /**< input value to check */
   }
 } /* jerry_value_get_type */
 
+/**
+ * Used by jerry_object_get_type to get the type of class objects
+ */
+static const uint8_t jerry_class_object_type[] =
+{
+  /* These objects require custom property resolving. */
+  JERRY_OBJECT_TYPE_STRING, /**< type of ECMA_OBJECT_CLASS_STRING */
+  JERRY_OBJECT_TYPE_ARGUMENTS, /**< type of ECMA_OBJECT_CLASS_ARGUMENTS */
+#if JERRY_BUILTIN_TYPEDARRAY
+  JERRY_OBJECT_TYPE_TYPEDARRAY, /**< type of ECMA_OBJECT_CLASS_TYPEDARRAY */
+#endif /* JERRY_BUILTIN_TYPEDARRAY */
+
+  /* These objects are marked by Garbage Collector. */
+#if JERRY_ESNEXT
+  JERRY_OBJECT_TYPE_GENERATOR, /**< type of ECMA_OBJECT_CLASS_GENERATOR */
+  JERRY_OBJECT_TYPE_GENERATOR, /**< type of ECMA_OBJECT_CLASS_ASYNC_GENERATOR */
+  JERRY_OBJECT_TYPE_ITERATOR, /**< type of ECMA_OBJECT_CLASS_ARRAY_ITERATOR */
+  JERRY_OBJECT_TYPE_ITERATOR, /**< type of ECMA_OBJECT_CLASS_SET_ITERATOR */
+  JERRY_OBJECT_TYPE_ITERATOR, /**< type of ECMA_OBJECT_CLASS_MAP_ITERATOR */
+#if JERRY_BUILTIN_REGEXP
+  JERRY_OBJECT_TYPE_GENERIC, /**< type of ECMA_OBJECT_CLASS_REGEXP_STRING_ITERATOR */
+#endif /* JERRY_BUILTIN_REGEXP */
+#endif /* JERRY_ESNEXT */
+#if JERRY_MODULE_SYSTEM
+  JERRY_OBJECT_TYPE_MODULE, /**< type of ECMA_OBJECT_CLASS_MODULE */
+#endif
+#if JERRY_BUILTIN_PROMISE
+  JERRY_OBJECT_TYPE_GENERIC, /**< type of ECMA_OBJECT_CLASS_PROMISE */
+  JERRY_OBJECT_TYPE_GENERIC, /**< type of ECMA_OBJECT_CLASS_PROMISE_CAPABILITY */
+#endif /* JERRY_BUILTIN_PROMISE */
+#if JERRY_BUILTIN_DATAVIEW
+  JERRY_OBJECT_TYPE_GENERIC, /**< type of ECMA_OBJECT_CLASS_DATAVIEW */
+#endif /* JERRY_BUILTIN_DATAVIEW */
+#if JERRY_BUILTIN_CONTAINER
+  JERRY_OBJECT_TYPE_CONTAINER, /**< type of ECMA_OBJECT_CLASS_CONTAINER */
+#endif /* JERRY_BUILTIN_CONTAINER */
+
+  /* Normal objects. */
+  JERRY_OBJECT_TYPE_BOOLEAN, /**< type of ECMA_OBJECT_CLASS_BOOLEAN */
+  JERRY_OBJECT_TYPE_NUMBER, /**< type of ECMA_OBJECT_CLASS_NUMBER */
+  JERRY_OBJECT_TYPE_GENERIC, /**< type of ECMA_OBJECT_CLASS_ERROR */
+  JERRY_OBJECT_TYPE_GENERIC, /**< type of ECMA_OBJECT_CLASS_INTERNAL_OBJECT */
+#if JERRY_PARSER
+  JERRY_OBJECT_TYPE_SCRIPT, /**< type of ECMA_OBJECT_CLASS_SCRIPT */
+#endif /* JERRY_PARSER */
+#if JERRY_BUILTIN_DATE
+  JERRY_OBJECT_TYPE_DATE, /**< type of ECMA_OBJECT_CLASS_DATE */
+#endif /* JERRY_BUILTIN_DATE */
+#if JERRY_BUILTIN_REGEXP
+  JERRY_OBJECT_TYPE_REGEXP, /**< type of ECMA_OBJECT_CLASS_REGEXP */
+#endif /* JERRY_BUILTIN_REGEXP */
+#if JERRY_ESNEXT
+  JERRY_OBJECT_TYPE_SYMBOL, /**< type of ECMA_OBJECT_CLASS_SYMBOL */
+  JERRY_OBJECT_TYPE_ITERATOR, /**< type of ECMA_OBJECT_CLASS_STRING_ITERATOR */
+#endif /* JERRY_ESNEXT */
+#if JERRY_BUILTIN_TYPEDARRAY
+  JERRY_OBJECT_TYPE_GENERIC, /**< type of ECMA_OBJECT_CLASS_ARRAY_BUFFER */
+#endif /* JERRY_BUILTIN_TYPEDARRAY */
+#if JERRY_BUILTIN_BIGINT
+  JERRY_OBJECT_TYPE_BIGINT, /**< type of ECMA_OBJECT_CLASS_BIGINT */
+#endif /* JERRY_BUILTIN_BIGINT */
+#if JERRY_BUILTIN_WEAKREF
+  JERRY_OBJECT_TYPE_WEAKREF, /**< type of ECMA_OBJECT_CLASS_WEAKREF */
+#endif /* JERRY_BUILTIN_WEAKREF */
+};
+
+JERRY_STATIC_ASSERT (sizeof (jerry_class_object_type) == ECMA_OBJECT_CLASS__MAX,
+                     jerry_class_object_type_must_have_object_class_max_elements);
+
 /**
  * Get the object type of the given value
  *
@@ -1293,101 +1361,8 @@ jerry_object_get_type (const jerry_value_t value) /**< input value to check */
 #endif /* JERRY_ESNEXT */
     case ECMA_OBJECT_TYPE_CLASS:
     {
-      switch (ext_obj_p->u.cls.type)
-      {
-        case ECMA_OBJECT_CLASS_ARGUMENTS:
-        {
-          return JERRY_OBJECT_TYPE_ARGUMENTS;
-        }
-#if JERRY_BUILTIN_TYPEDARRAY
-        case ECMA_OBJECT_CLASS_TYPEDARRAY:
-        case ECMA_OBJECT_CLASS_TYPEDARRAY_WITH_INFO:
-        {
-          return JERRY_OBJECT_TYPE_TYPEDARRAY;
-        }
-#endif /* JERRY_BUILTIN_TYPEDARRAY */
-#if JERRY_PARSER
-        case ECMA_OBJECT_CLASS_SCRIPT:
-        {
-          return JERRY_OBJECT_TYPE_SCRIPT;
-        }
-#endif /* JERRY_PARSER */
-        case ECMA_OBJECT_CLASS_BOOLEAN:
-        {
-          return JERRY_OBJECT_TYPE_BOOLEAN;
-        }
-        case ECMA_OBJECT_CLASS_STRING:
-        {
-          return JERRY_OBJECT_TYPE_STRING;
-        }
-        case ECMA_OBJECT_CLASS_NUMBER:
-        {
-          return JERRY_OBJECT_TYPE_NUMBER;
-        }
-#if JERRY_BUILTIN_DATE
-        case ECMA_OBJECT_CLASS_DATE:
-        {
-          return JERRY_OBJECT_TYPE_DATE;
-        }
-#endif /* JERRY_BUILTIN_DATE */
-#if JERRY_BUILTIN_REGEXP
-        case ECMA_OBJECT_CLASS_REGEXP:
-        {
-          return JERRY_OBJECT_TYPE_REGEXP;
-        }
-#endif /* JERRY_BUILTIN_REGEXP */
-#if JERRY_ESNEXT
-        case ECMA_OBJECT_CLASS_SYMBOL:
-        {
-          return JERRY_OBJECT_TYPE_SYMBOL;
-        }
-        case ECMA_OBJECT_CLASS_GENERATOR:
-        case ECMA_OBJECT_CLASS_ASYNC_GENERATOR:
-        {
-          return JERRY_OBJECT_TYPE_GENERATOR;
-        }
-        case ECMA_OBJECT_CLASS_ARRAY_ITERATOR:
-#if JERRY_BUILTIN_SET
-        case ECMA_OBJECT_CLASS_SET_ITERATOR:
-#endif /* JERRY_BUILTIN_SET */
-#if JERRY_BUILTIN_MAP
-        case ECMA_OBJECT_CLASS_MAP_ITERATOR:
-#endif /* JERRY_BUILTIN_MAP */
-        case ECMA_OBJECT_CLASS_STRING_ITERATOR:
-        {
-          return JERRY_OBJECT_TYPE_ITERATOR;
-        }
-#endif /* JERRY_ESNEXT */
-#if JERRY_MODULE_SYSTEM
-        case ECMA_OBJECT_CLASS_MODULE:
-        {
-          return JERRY_OBJECT_TYPE_MODULE;
-        }
-#endif /* JERRY_MODULE_SYSTEM */
-#if JERRY_BUILTIN_CONTAINER
-        case ECMA_OBJECT_CLASS_CONTAINER:
-        {
-          return JERRY_OBJECT_TYPE_CONTAINER;
-        }
-#endif /* JERRY_BUILTIN_CONTAINER */
-#if JERRY_BUILTIN_BIGINT
-        case ECMA_OBJECT_CLASS_BIGINT:
-        {
-          return JERRY_OBJECT_TYPE_BIGINT;
-        }
-#endif /* JERRY_BUILTIN_BIGINT */
-#if JERRY_BUILTIN_WEAKREF
-        case ECMA_OBJECT_CLASS_WEAKREF:
-        {
-          return JERRY_OBJECT_TYPE_WEAKREF;
-        }
-#endif /* JERRY_BUILTIN_WEAKREF */
-        default:
-        {
-          break;
-        }
-      }
-      break;
+      JERRY_ASSERT (ext_obj_p->u.cls.type < ECMA_OBJECT_CLASS__MAX);
+      return jerry_class_object_type[ext_obj_p->u.cls.type];
     }
     default:
     {
@@ -3386,7 +3361,6 @@ jerry_set_internal_property (const jerry_value_t obj_val, /**< object value */
     {
       ecma_extended_object_t *container_p = (ecma_extended_object_t *) internal_object_p;
       container_p->u.cls.type = ECMA_OBJECT_CLASS_INTERNAL_OBJECT;
-      container_p->u.cls.u2.id = LIT_MAGIC_STRING_OBJECT_UL;
     }
 
     value_p->value = ecma_make_object_value (internal_object_p);
@@ -6108,7 +6082,7 @@ jerry_get_container_type (const jerry_value_t value) /**< the container object *
 
     if (ecma_object_class_is (obj_p, ECMA_OBJECT_CLASS_CONTAINER))
     {
-      switch (((ecma_extended_object_t *) obj_p)->u.cls.u2.id)
+      switch (((ecma_extended_object_t *) obj_p)->u.cls.u2.container_id)
       {
 #if JERRY_BUILTIN_MAP
         case LIT_MAGIC_STRING_MAP_UL:

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

@@ -728,7 +728,6 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */
           }
 #if JERRY_BUILTIN_TYPEDARRAY
           case ECMA_OBJECT_CLASS_TYPEDARRAY:
-          case ECMA_OBJECT_CLASS_TYPEDARRAY_WITH_INFO:
           {
             ecma_gc_set_object_visited (ecma_typedarray_get_arraybuffer (object_p));
             break;
@@ -770,28 +769,28 @@ ecma_gc_mark (ecma_object_t *object_p) /**< object to mark from */
           case ECMA_OBJECT_CLASS_CONTAINER:
           {
 #if JERRY_BUILTIN_MAP
-            if (ext_object_p->u.cls.u2.id == LIT_MAGIC_STRING_MAP_UL)
+            if (ext_object_p->u.cls.u2.container_id == LIT_MAGIC_STRING_MAP_UL)
             {
               ecma_gc_mark_map_object (object_p);
               break;
             }
 #endif /* JERRY_BUILTIN_MAP */
 #if JERRY_BUILTIN_WEAKMAP
-            if (ext_object_p->u.cls.u2.id == LIT_MAGIC_STRING_WEAKMAP_UL)
+            if (ext_object_p->u.cls.u2.container_id == LIT_MAGIC_STRING_WEAKMAP_UL)
             {
               ecma_gc_mark_weakmap_object (object_p);
               break;
             }
 #endif /* JERRY_BUILTIN_WEAKMAP */
 #if JERRY_BUILTIN_SET
-            if (ext_object_p->u.cls.u2.id == LIT_MAGIC_STRING_SET_UL)
+            if (ext_object_p->u.cls.u2.container_id == LIT_MAGIC_STRING_SET_UL)
             {
               ecma_gc_mark_set_object (object_p);
               break;
             }
 #endif /* JERRY_BUILTIN_SET */
 #if JERRY_BUILTIN_WEAKSET
-            JERRY_ASSERT (ext_object_p->u.cls.u2.id == LIT_MAGIC_STRING_WEAKSET_UL);
+            JERRY_ASSERT (ext_object_p->u.cls.u2.container_id == LIT_MAGIC_STRING_WEAKSET_UL);
 #endif /* JERRY_BUILTIN_WEAKSET */
             break;
           }
@@ -1591,9 +1590,12 @@ ecma_gc_free_object (ecma_object_t *object_p) /**< object to free */
           break;
         }
 #if JERRY_BUILTIN_TYPEDARRAY
-        case ECMA_OBJECT_CLASS_TYPEDARRAY_WITH_INFO:
+        case ECMA_OBJECT_CLASS_TYPEDARRAY:
         {
-          ext_object_size = sizeof (ecma_extended_typedarray_object_t);
+          if (ext_object_p->u.cls.u2.typedarray_flags & ECMA_TYPEDARRAY_IS_EXTENDED)
+          {
+            ext_object_size = sizeof (ecma_extended_typedarray_object_t);
+          }
           break;
         }
 #endif /* JERRY_BUILTIN_TYPEDARRAY */

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

@@ -698,6 +698,10 @@ typedef enum
 
 /**
  * Types of objects with class property.
+ *
+ * Note:
+ *     when this type is changed, both ecma_class_object_magic_string_id
+ *     and jerry_class_object_type must be updated as well
  */
 typedef enum
 {
@@ -706,7 +710,6 @@ typedef enum
   ECMA_OBJECT_CLASS_ARGUMENTS, /**< Arguments object (10.6) */
 #if JERRY_BUILTIN_TYPEDARRAY
   ECMA_OBJECT_CLASS_TYPEDARRAY, /**< TypedArray which does NOT need extra space to store length and offset */
-  ECMA_OBJECT_CLASS_TYPEDARRAY_WITH_INFO, /**< TypedArray which NEEDS extra space to store length and offset */
 #endif /* JERRY_BUILTIN_TYPEDARRAY */
 
   /* These objects are marked by Garbage Collector. */
@@ -1037,10 +1040,10 @@ typedef struct
         uint8_t regexp_string_iterator_flags; /**< flags for RegExp string iterator */
 #endif /* JERRY_ESNEXT */
 #if JERRY_BUILTIN_PROMISE
-        uint8_t promise_flags; /**< flags for Promise objects */
+        uint8_t promise_flags; /**< Promise object flags */
 #endif /* JERRY_BUILTIN_PROMISE */
 #if JERRY_BUILTIN_CONTAINER
-        uint8_t container_flags; /**< flags for container objects */
+        uint8_t container_flags; /**< container object flags */
 #endif /* JERRY_BUILTIN_CONTAINER */
 #if JERRY_BUILTIN_TYPEDARRAY
         uint8_t array_buffer_flags; /**< ArrayBuffer flags */
@@ -1052,26 +1055,40 @@ typedef struct
        */
       union
       {
-        /* The ecma_object_get_class_name must handle those types which does not use id. */
-        uint16_t id; /**< magic string id of the class */
         uint16_t formal_params_number; /**< for arguments: formal parameters number */
+#if JERRY_ESNEXT
         uint16_t iterator_index; /**< for %Iterator%: [[%Iterator%NextIndex]] property */
         uint16_t executable_obj_flags; /**< executable object flags */
+#endif /* JERRY_ESNEXT */
+#if JERRY_BUILTIN_CONTAINER
+        uint16_t container_id; /**< magic string id of a container */
+#endif /* JERRY_BUILTIN_CONTAINER */
+#if JERRY_BUILTIN_TYPEDARRAY
+        uint16_t typedarray_flags; /**< typed array object flags */
+#endif /* JERRY_BUILTIN_TYPEDARRAY */
       } u2;
       /**
        * Description of 32 bit / value. These extra fields depend on the type.
        */
       union
       {
         ecma_value_t value; /**< value of the object (e.g. boolean, number, string, etc.) */
+#if !JERRY_ESNEXT
         ecma_value_t date; /**< Date object [[DateValue]] internal property */
+#endif /* !JERRY_ESNEXT */
         ecma_value_t target; /**< [[ProxyTarget]] or [[WeakRefTarget]] internal property */
-        ecma_value_t head; /**< points to the async generator task queue head item */
+#if JERRY_BUILTIN_PROMISE
         ecma_value_t promise; /**< PromiseCapability[[Promise]] internal slot */
-        ecma_value_t arraybuffer; /**< for typedarray: internal arraybuffer */
+#endif /* JERRY_BUILTIN_PROMISE */
+#if JERRY_BUILTIN_TYPEDARRAY
+        ecma_value_t arraybuffer; /**< for typedarray: ArrayBuffer reference */
+#endif /* JERRY_BUILTIN_TYPEDARRAY */
+#if JERRY_ESNEXT
+        ecma_value_t head; /**< points to the async generator task queue head item */
         ecma_value_t iterated_value; /**< for %Iterator%: [[IteratedObject]] property */
         ecma_value_t spread_value; /**< for spread object: spreaded element */
         int32_t tza; /**< TimeZone adjustment for date objects */
+#endif /* JERRY_ESNEXT */
         uint32_t length; /**< length related property (e.g. length of ArrayBuffer) */
         uint32_t arguments_number; /**< for arguments: arguments number */
 #if JERRY_MODULE_SYSTEM
@@ -2031,14 +2048,22 @@ typedef enum
 } ecma_typedarray_type_t;
 
 /**
- * Extra information for ArrayBuffers.
+ * TypedArray flags.
+ */
+typedef enum
+{
+  ECMA_TYPEDARRAY_IS_EXTENDED = (1u << 0), /* an ecma_extended_typedarray_object_t is allocated for the TypedArray */
+} ecma_typedarray_flag_t;
+
+/**
+ * ArrayBuffers flags.
  */
 typedef enum
 {
-  ECMA_ARRAYBUFFER_INTERNAL_MEMORY = 0u,        /* ArrayBuffer memory is handled internally. */
+  ECMA_ARRAYBUFFER_INTERNAL_MEMORY = 0u, /* ArrayBuffer memory is handled internally. */
   ECMA_ARRAYBUFFER_EXTERNAL_MEMORY = (1u << 0), /* ArrayBuffer created via jerry_create_arraybuffer_external. */
-  ECMA_ARRAYBUFFER_DETACHED = (1u << 1),        /* ArrayBuffer has been detached */
-} ecma_arraybuffer_extra_flag_t;
+  ECMA_ARRAYBUFFER_DETACHED = (1u << 1), /* ArrayBuffer has been detached */
+} ecma_arraybuffer_flag_t;
 
 /**
  * Check whether the ArrayBuffer has external underlying buffer
@@ -2058,7 +2083,7 @@ typedef struct
 {
   ecma_extended_object_t extended_object; /**< extended object part */
   void *buffer_p; /**< external buffer pointer */
-  ecma_object_native_free_callback_t free_cb; /**<  the free callback for the above buffer pointer */
+  ecma_object_native_free_callback_t free_cb; /**< the free callback for the above buffer pointer */
 } ecma_arraybuffer_external_info;
 
 /**

jerry-core/ecma/builtin-objects/ecma-builtin-date.c

@@ -739,7 +739,6 @@ ecma_builtin_date_create (ecma_number_t tv)
   ecma_date_object_t *date_object_p = (ecma_date_object_t *) obj_p;
   date_object_p->header.u.cls.type = ECMA_OBJECT_CLASS_DATE;
   date_object_p->header.u.cls.u1.date_flags = ECMA_DATE_TZA_NONE;
-  date_object_p->header.u.cls.u2.id = LIT_MAGIC_STRING_DATE_UL;
   date_object_p->header.u.cls.u3.tza = 0;
   date_object_p->date_value = tv;
 #else /* !JERRY_ESNEXT */
@@ -751,7 +750,6 @@ ecma_builtin_date_create (ecma_number_t tv)
 
   ecma_extended_object_t *ext_object_p = (ecma_extended_object_t *) obj_p;
   ext_object_p->u.cls.type = ECMA_OBJECT_CLASS_DATE;
-  ext_object_p->u.cls.u2.id = LIT_MAGIC_STRING_DATE_UL;
   ECMA_SET_INTERNAL_VALUE_POINTER (ext_object_p->u.cls.u3.date, date_value_p);
 #endif /* JERRY_ESNEXT */
 

jerry-core/ecma/builtin-objects/ecma-builtin-weakref.c

@@ -82,7 +82,6 @@ ecma_builtin_weakref_dispatch_construct (const ecma_value_t *arguments_list_p, /
   ecma_deref_object (proto_p);
   ecma_extended_object_t *ext_obj_p = (ecma_extended_object_t *) object_p;
   ext_obj_p->u.cls.type = ECMA_OBJECT_CLASS_WEAKREF;
-  ext_obj_p->u.cls.u2.id = LIT_MAGIC_STRING_WEAKREF_UL;
   ext_obj_p->u.cls.u3.target = arguments_list_p[0];
   ecma_op_object_set_weak (ecma_get_object_from_value (arguments_list_p[0]), object_p);