Unify internal property creation.

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

Author: zherczeg

Diff for: jerry-core/ecma/base/ecma-gc.c

@@ -25,6 +25,7 @@
 #include "ecma-globals.h"
 #include "ecma-gc.h"
 #include "ecma-helpers.h"
+#include "ecma-lcache.h"
 #include "ecma-objects.h"
 #include "ecma-property-hashmap.h"
 #include "ecma-proxy-object.h"
@@ -252,8 +253,17 @@ ecma_gc_mark_properties (ecma_property_pair_t *property_pair_p) /**< property pa
         }
         break;
       }
-      case ECMA_PROPERTY_TYPE_INTERNAL:
+      default:
       {
+        JERRY_ASSERT (ECMA_PROPERTY_GET_TYPE (property) == ECMA_PROPERTY_TYPE_SPECIAL);
+
+        if (!ECMA_PROPERTY_IS_NAMED_PROPERTY (property))
+        {
+          JERRY_ASSERT (property == ECMA_PROPERTY_TYPE_DELETED
+                        || property == ECMA_PROPERTY_TYPE_HASHMAP);
+          break;
+        }
+
         JERRY_ASSERT (ECMA_PROPERTY_GET_NAME_TYPE (property) == ECMA_DIRECT_STRING_MAGIC
                       && property_pair_p->names_cp[index] >= LIT_INTERNAL_MAGIC_STRING_FIRST_DATA
                       && property_pair_p->names_cp[index] < LIT_MAGIC_STRING__COUNT);
@@ -277,14 +287,6 @@ ecma_gc_mark_properties (ecma_property_pair_t *property_pair_p) /**< property pa
 #endif /* ENABLED (JERRY_ESNEXT) */
         break;
       }
-      default:
-      {
-        JERRY_ASSERT (ECMA_PROPERTY_GET_TYPE (property) == ECMA_PROPERTY_TYPE_SPECIAL);
-
-        JERRY_ASSERT (property == ECMA_PROPERTY_TYPE_HASHMAP
-                      || property == ECMA_PROPERTY_TYPE_DELETED);
-        break;
-      }
     }
   }
 } /* ecma_gc_mark_properties */
@@ -1316,65 +1318,76 @@ ecma_gc_free_properties (ecma_object_t *object_p) /**< object */
       ecma_property_t *property_p = (ecma_property_t *) (prop_iter_p->types + i);
       jmem_cpointer_t name_cp = prop_pair_p->names_cp[i];
 
-      if (ECMA_PROPERTY_GET_TYPE (*property_p) == ECMA_PROPERTY_TYPE_INTERNAL)
+      if (*property_p == ECMA_PROPERTY_TYPE_DELETED)
       {
-        JERRY_ASSERT (ECMA_PROPERTY_GET_NAME_TYPE (*property_p) == ECMA_DIRECT_STRING_MAGIC);
+        continue;
+      }
 
-        /* Call the native's free callback. */
-        switch (name_cp)
-        {
+      if (ECMA_PROPERTY_GET_TYPE (*property_p) != ECMA_PROPERTY_TYPE_SPECIAL)
+      {
+        ecma_free_property (object_p, name_cp, property_p);
+        continue;
+      }
+
+      JERRY_ASSERT (ECMA_PROPERTY_IS_INTERNAL (*property_p));
+      JERRY_ASSERT (ECMA_PROPERTY_GET_NAME_TYPE (*property_p) == ECMA_DIRECT_STRING_MAGIC);
+
+      /* Call the native's free callback. */
+      switch (name_cp)
+      {
 #if ENABLED (JERRY_ESNEXT)
-          case LIT_INTERNAL_MAGIC_STRING_ENVIRONMENT_RECORD:
-          {
-            ecma_environment_record_t *environment_record_p;
-            environment_record_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_environment_record_t,
+        case LIT_INTERNAL_MAGIC_STRING_ENVIRONMENT_RECORD:
+        {
+          ecma_environment_record_t *environment_record_p;
+          environment_record_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_environment_record_t,
                                                                     prop_pair_p->values[i].value);
-            jmem_heap_free_block (environment_record_p, sizeof (ecma_environment_record_t));
-            break;
-          }
-          case LIT_INTERNAL_MAGIC_STRING_CLASS_FIELD_COMPUTED:
-          {
-            ecma_value_t *compact_collection_p;
-            compact_collection_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_value_t,
+          jmem_heap_free_block (environment_record_p, sizeof (ecma_environment_record_t));
+          break;
+        }
+        case LIT_INTERNAL_MAGIC_STRING_CLASS_FIELD_COMPUTED:
+        {
+          ecma_value_t *compact_collection_p;
+          compact_collection_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_value_t,
                                                                     prop_pair_p->values[i].value);
-            ecma_compact_collection_free (compact_collection_p);
-            break;
-          }
+          ecma_compact_collection_free (compact_collection_p);
+          break;
+        }
 #endif /* ENABLED (JERRY_ESNEXT) */
 #if ENABLED (JERRY_BUILTIN_WEAKMAP) || ENABLED (JERRY_BUILTIN_WEAKSET)
-          case LIT_INTERNAL_MAGIC_STRING_WEAK_REFS:
-          {
-            ecma_collection_t *refs_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_collection_t,
+        case LIT_INTERNAL_MAGIC_STRING_WEAK_REFS:
+        {
+          ecma_collection_t *refs_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_collection_t,
                                                                          prop_pair_p->values[i].value);
-            for (uint32_t j = 0; j < refs_p->item_count; j++)
+          for (uint32_t j = 0; j < refs_p->item_count; j++)
+          {
+            const ecma_value_t value = refs_p->buffer_p[j];
+            if (!ecma_is_value_empty (value))
             {
-              const ecma_value_t value = refs_p->buffer_p[j];
-              if (!ecma_is_value_empty (value))
-              {
-                ecma_object_t *container_p = ecma_get_object_from_value (value);
+              ecma_object_t *container_p = ecma_get_object_from_value (value);
 
-                ecma_op_container_remove_weak_entry (container_p,
-                                                     ecma_make_object_value (object_p));
-              }
+              ecma_op_container_remove_weak_entry (container_p,
+                                                   ecma_make_object_value (object_p));
             }
-
-            ecma_collection_destroy (refs_p);
-            break;
           }
+
+          ecma_collection_destroy (refs_p);
+          break;
+        }
 #endif /* ENABLED (JERRY_BUILTIN_WEAKMAP) || ENABLED (JERRY_BUILTIN_WEAKSET) */
-          default:
-          {
-            JERRY_ASSERT (name_cp == LIT_INTERNAL_MAGIC_STRING_NATIVE_POINTER);
-            ecma_gc_free_native_pointer (property_p);
-            break;
-          }
+        default:
+        {
+          JERRY_ASSERT (name_cp == LIT_INTERNAL_MAGIC_STRING_NATIVE_POINTER);
+          ecma_gc_free_native_pointer (property_p);
+          break;
         }
       }
 
-      if (prop_iter_p->types[i] != ECMA_PROPERTY_TYPE_DELETED)
+#if ENABLED (JERRY_LCACHE)
+      if (ecma_is_property_lcached (property_p))
       {
-        ecma_free_property (object_p, name_cp, property_p);
+        ecma_lcache_invalidate (object_p, name_cp, property_p);
       }
+#endif /* ENABLED (JERRY_LCACHE) */
     }
 
     prop_iter_cp = prop_iter_p->next_property_cp;

Diff for: jerry-core/ecma/base/ecma-globals.h

@@ -354,11 +354,10 @@ typedef struct
  */
 typedef enum
 {
-  ECMA_PROPERTY_TYPE_SPECIAL, /**< special purpose property (deleted / hashmap) */
+  ECMA_PROPERTY_TYPE_SPECIAL, /**< special purpose property (deleted / hashmap / internal) */
   ECMA_PROPERTY_TYPE_NAMEDDATA, /**< property is named data */
   ECMA_PROPERTY_TYPE_NAMEDACCESSOR, /**< property is named accessor */
-  ECMA_PROPERTY_TYPE_INTERNAL, /**< internal property with custom data field */
-  ECMA_PROPERTY_TYPE_VIRTUAL = ECMA_PROPERTY_TYPE_INTERNAL, /**< property is virtual data property */
+  ECMA_PROPERTY_TYPE_VIRTUAL, /**< property is virtual data property */
 
   ECMA_PROPERTY_TYPE__MAX = ECMA_PROPERTY_TYPE_VIRTUAL, /**< highest value for property types. */
 } ecma_property_types_t;
@@ -470,45 +469,20 @@ typedef enum
   *(property_p) ^= ECMA_PROPERTY_TYPE_NAMEDACCESSOR ^ ECMA_PROPERTY_TYPE_NAMEDDATA;
 
 /**
- * Convert data property to internal property.
- */
-#define ECMA_CONVERT_DATA_PROPERTY_TO_INTERNAL_PROPERTY(property_p) \
-   *(property_p) = (uint8_t) (*(property_p) + (ECMA_PROPERTY_TYPE_INTERNAL - ECMA_PROPERTY_TYPE_NAMEDDATA))
-
-/**
- * Convert internal property to data property.
+ * Type of hash-map property.
  */
-#define ECMA_CONVERT_INTERNAL_PROPERTY_TO_DATA_PROPERTY(property_p) \
-   *(property_p) = (uint8_t) (*(property_p) - (ECMA_PROPERTY_TYPE_INTERNAL - ECMA_PROPERTY_TYPE_NAMEDDATA))
+#define ECMA_PROPERTY_TYPE_HASHMAP ((uint8_t) ECMA_PROPERTY_TYPE_SPECIAL)
 
 /**
- * Special property identifiers.
+ * Type of special properties with direct magic string name.
  */
-typedef enum
-{
-  /* Note: when new special types are added
-   * ECMA_PROPERTY_IS_PROPERTY_PAIR must be updated as well. */
-  ECMA_SPECIAL_PROPERTY_HASHMAP, /**< hashmap property */
-  ECMA_SPECIAL_PROPERTY_DELETED, /**< deleted property */
-
-  ECMA_SPECIAL_PROPERTY__COUNT /**< Number of special property types */
-} ecma_special_property_id_t;
-
-/**
- * Define special property type.
- */
-#define ECMA_SPECIAL_PROPERTY_VALUE(type) \
-  ((uint8_t) (ECMA_PROPERTY_TYPE_SPECIAL | ((type) << ECMA_PROPERTY_NAME_TYPE_SHIFT)))
+#define ECMA_PROPERTY_TYPE_DIRECT \
+  (ECMA_PROPERTY_TYPE_SPECIAL | (ECMA_DIRECT_STRING_MAGIC << ECMA_PROPERTY_NAME_TYPE_SHIFT))
 
 /**
  * Type of deleted property.
  */
-#define ECMA_PROPERTY_TYPE_DELETED ECMA_SPECIAL_PROPERTY_VALUE (ECMA_SPECIAL_PROPERTY_DELETED)
-
-/**
- * Type of hash-map property.
- */
-#define ECMA_PROPERTY_TYPE_HASHMAP ECMA_SPECIAL_PROPERTY_VALUE (ECMA_SPECIAL_PROPERTY_HASHMAP)
+#define ECMA_PROPERTY_TYPE_DELETED ((uint8_t) ECMA_PROPERTY_TYPE_DIRECT)
 
 /**
  * Type of property not found.
@@ -614,11 +588,37 @@ typedef struct
 #define ECMA_PROPERTY_IS_PROPERTY_PAIR(property_header_p) \
   ((property_header_p)->types[0] != ECMA_PROPERTY_TYPE_HASHMAP)
 
+/**
+ * Property type of all internal properties
+ */
+#define ECMA_PROPERTY_TYPE_INTERNAL (ECMA_PROPERTY_TYPE_DIRECT | ECMA_PROPERTY_FLAG_WRITABLE)
+
+/**
+ * Property type of all internal properties
+ */
+#define ECMA_PROPERTY_IS_INTERNAL(property) \
+  (((property) | ECMA_PROPERTY_FLAG_LCACHED) == (ECMA_PROPERTY_TYPE_INTERNAL | ECMA_PROPERTY_FLAG_LCACHED))
+
+/**
+ * Create internal property.
+ */
+#define ECMA_CREATE_INTERNAL_PROPERTY(object_p, name_p, property_p, property_value_p) \
+  do \
+  { \
+    (property_value_p) = ecma_create_named_data_property ((object_p), \
+                                                          (name_p), \
+                                                          ECMA_PROPERTY_FLAG_WRITABLE, \
+                                                          &(property_p)); \
+    JERRY_ASSERT (*(property_p) == (ECMA_PROPERTY_TYPE_INTERNAL | ECMA_PROPERTY_TYPE_NAMEDDATA)); \
+    *(property_p) = ECMA_PROPERTY_TYPE_INTERNAL; \
+  } \
+  while (0)
+
 /**
  * Returns true if the property is named property.
  */
 #define ECMA_PROPERTY_IS_NAMED_PROPERTY(property) \
-  (ECMA_PROPERTY_GET_TYPE (property) != ECMA_PROPERTY_TYPE_SPECIAL)
+  (((property) & (ECMA_PROPERTY_TYPE_MASK | ECMA_PROPERTY_FLAG_WRITABLE)) != ECMA_PROPERTY_TYPE_SPECIAL)
 
 /**
  * Add the offset part to a property for computing its property data pointer.
@@ -1219,19 +1219,24 @@ typedef struct
  *  - is_value_defined : true
  *  - is_configurable_defined, is_writable_defined, is_enumerable_defined : true
  */
-#define ECMA_NAME_DATA_PROPERTY_DESCRIPTOR_BITS 0x3c0
+#define ECMA_NAME_DATA_PROPERTY_DESCRIPTOR_BITS ((uint16_t) (ECMA_PROP_IS_VALUE_DEFINED \
+                                                             | ECMA_PROP_IS_CONFIGURABLE_DEFINED \
+                                                             | ECMA_PROP_IS_ENUMERABLE_DEFINED \
+                                                             | ECMA_PROP_IS_WRITABLE_DEFINED))
 
 /**
  * Bitmask to get a the physical property flags from an ecma_property_descriptor
  */
-#define ECMA_PROPERTY_FLAGS_MASK 0x1c
+#define ECMA_PROPERTY_FLAGS_MASK ((uint16_t) (ECMA_PROP_IS_CONFIGURABLE \
+                                              | ECMA_PROP_IS_ENUMERABLE \
+                                              | ECMA_PROP_IS_WRITABLE))
 
 /**
  * Flag that controls failure handling during defining property
  *
  * Note: This flags represents the [[DefineOwnProperty]] (P, Desc, Throw) 3rd argument
  */
-#define ECMA_IS_THROW (1 << 5)
+#define ECMA_IS_THROW ((uint8_t) ECMA_PROP_IS_THROW)
 
 #if !ENABLED (JERRY_NUMBER_TYPE_FLOAT64)
 /**

Diff for: jerry-core/ecma/base/ecma-helpers-external-pointers.c

@@ -54,12 +54,9 @@ ecma_create_native_pointer_property (ecma_object_t *obj_p, /**< object to create
   if (property_p == NULL)
   {
     ecma_property_value_t *value_p;
-    value_p = ecma_create_named_data_property (obj_p, name_p, ECMA_PROPERTY_CONFIGURABLE_WRITABLE, &property_p);
-
-    ECMA_CONVERT_DATA_PROPERTY_TO_INTERNAL_PROPERTY (property_p);
+    ECMA_CREATE_INTERNAL_PROPERTY (obj_p, name_p, property_p, value_p);
 
     native_pointer_p = jmem_heap_alloc_block (sizeof (ecma_native_pointer_t));
-
     ECMA_SET_INTERNAL_VALUE_POINTER (value_p->value, native_pointer_p);
   }
   else