Rework own property enumeration

Properry name filtering is done during the enumeration.

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

Author: zherczeg

jerry-core/api/jerry.c

@@ -4604,6 +4604,12 @@ jerry_object_get_property_names (const jerry_value_t obj_val, /**< object */
 
   ecma_ref_object (obj_iter_p);
 
+  if ((filter & JERRY_PROPERTY_FILTER_EXLCUDE_STRINGS)
+      && !(filter & JERRY_PROPERTY_FILTER_INTEGER_INDICES_AS_NUMBER))
+  {
+    filter |= JERRY_PROPERTY_FILTER_EXLCUDE_INTEGER_INDICES;
+  }
+
   while (true)
   {
     /* Step 1. Get Object.[[OwnKeys]] */
@@ -4623,34 +4629,7 @@ jerry_object_get_property_names (const jerry_value_t obj_val, /**< object */
       ecma_string_t *key_p = ecma_get_prop_name_from_value (key);
       uint32_t index = ecma_string_get_array_index (key_p);
 
-      /* Step 2. Filter by key type */
-      if (filter & (JERRY_PROPERTY_FILTER_EXLCUDE_STRINGS
-                    | JERRY_PROPERTY_FILTER_EXLCUDE_SYMBOLS
-                    | JERRY_PROPERTY_FILTER_EXLCUDE_INTEGER_INDICES))
-      {
-        if (ecma_is_value_symbol (key))
-        {
-          if (filter & JERRY_PROPERTY_FILTER_EXLCUDE_SYMBOLS)
-          {
-            continue;
-          }
-        }
-        else if (index != ECMA_STRING_NOT_ARRAY_INDEX)
-        {
-          if ((filter & JERRY_PROPERTY_FILTER_EXLCUDE_INTEGER_INDICES)
-              || ((filter & JERRY_PROPERTY_FILTER_EXLCUDE_STRINGS)
-                  && !(filter & JERRY_PROPERTY_FILTER_INTEGER_INDICES_AS_NUMBER)))
-          {
-            continue;
-          }
-        }
-        else if (filter & JERRY_PROPERTY_FILTER_EXLCUDE_STRINGS)
-        {
-          continue;
-        }
-      }
-
-      /* Step 3. Filter property attributes */
+      /* Step 2. Filter property attributes */
       if (filter & (JERRY_PROPERTY_FILTER_EXLCUDE_NON_CONFIGURABLE
                     | JERRY_PROPERTY_FILTER_EXLCUDE_NON_ENUMERABLE
                     | JERRY_PROPERTY_FILTER_EXLCUDE_NON_WRITABLE))
@@ -4729,7 +4708,7 @@ jerry_object_get_property_names (const jerry_value_t obj_val, /**< object */
 
     ecma_collection_free (prop_names_p);
 
-    /* Step 4: Traverse prototype chain */
+    /* Step 3: Traverse prototype chain */
 
     if ((filter & JERRY_PROPERTY_FILTER_TRAVERSE_PROTOTYPE_CHAIN) != JERRY_PROPERTY_FILTER_TRAVERSE_PROTOTYPE_CHAIN)
     {

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

@@ -2439,8 +2439,6 @@ typedef struct
   uint32_t array_index_named_props; /**< number of array index named properties */
   uint32_t string_named_props; /**< number of string named properties */
   uint32_t symbol_named_props; /**< number of symbol named properties */
-  uint32_t lazy_string_named_props; /**< number of lazy instantiated string properties */
-  uint32_t lazy_symbol_named_props; /**< number of lazy instantiated symbol properties */
 } ecma_property_counter_t;
 
 /**

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

@@ -670,7 +670,7 @@ ecma_module_heap_sort_shift_down (ecma_value_t *buffer_p, /**< array of items */
   while (true)
   {
     uint32_t highest_index = item_index;
-    uint32_t current_index = item_index * 2 + 2;
+    uint32_t current_index = (item_index << 1) + 2;
 
     if (current_index >= item_count)
     {

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

@@ -1336,36 +1336,14 @@ ecma_op_object_get_own_property_keys (ecma_value_t this_arg, /**< this argument
   }
 
   ecma_collection_t *props_p = ecma_op_object_own_property_keys (obj_p, filter);
+  ecma_deref_object (obj_p);
 
   if (props_p == NULL)
   {
-    ecma_deref_object (obj_p);
     return ECMA_VALUE_ERROR;
   }
 
-  /* 3. */
-  ecma_collection_t *name_list_p = ecma_new_collection ();
-
-  /* 4. */
-  for (uint32_t i = 0; i < props_p->item_count; i++)
-  {
-    ecma_value_t prop_name = props_p->buffer_p[i];
-    ecma_string_t *name_p = ecma_get_prop_name_from_value (prop_name);
-
-    if ((ecma_prop_name_is_symbol (name_p) && type == ECMA_OBJECT_ROUTINE_GET_OWN_PROPERTY_SYMBOLS)
-        || (ecma_is_value_string (prop_name) && type == ECMA_OBJECT_ROUTINE_GET_OWN_PROPERTY_NAMES))
-    {
-      ecma_ref_ecma_string (name_p);
-      ecma_collection_push_back (name_list_p, prop_name);
-    }
-  }
-
-  ecma_value_t result_array = ecma_op_new_array_object_from_collection (name_list_p, false);
-
-  ecma_deref_object (obj_p);
-  ecma_collection_free (props_p);
-
-  return result_array;
+  return ecma_op_new_array_object_from_collection (props_p, false);
 #else /* !JERRY_ESNEXT */
   JERRY_UNUSED (type);
   ecma_object_t *obj_p = ecma_get_object_from_value (this_arg);

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

@@ -206,7 +206,7 @@ ecma_builtin_reflect_dispatch_routine (uint8_t builtin_routine_id, /**< built-in
       return ecma_raise_type_error (ECMA_ERR_MSG ("Reflect.construct expects an object as second argument"));
     }
 
-    ecma_collection_t *coll_p = ecma_op_create_list_from_array_like (arguments_list[1], false);
+    ecma_collection_t *coll_p = ecma_op_create_list_from_array_like (arguments_list[1], ECMA_FROM_ARRAY_LIKE_ANY);
 
     if (coll_p == NULL)
     {

jerry-core/ecma/operations/ecma-conversion.c

@@ -1083,8 +1083,7 @@ ecma_op_to_index (ecma_value_t value, /**< ecma value */
  */
 ecma_collection_t *
 ecma_op_create_list_from_array_like (ecma_value_t arr,  /**< array value */
-                                     bool prop_names_only) /**< true - accept only property names
-                                                                false - otherwise */
+                                     uint32_t options) /**< from array like and property name filter flags */
 {
   /* 1. */
   JERRY_ASSERT (!ECMA_IS_VALUE_ERROR (arr));
@@ -1095,10 +1094,12 @@ ecma_op_create_list_from_array_like (ecma_value_t arr,  /**< array value */
     ecma_raise_type_error (ECMA_ERR_MSG (ecma_error_argument_is_not_an_object));
     return NULL;
   }
+
   ecma_object_t *obj_p = ecma_get_object_from_value (arr);
 
   /* 4. 5. */
   ecma_length_t len;
+
   if (ECMA_IS_VALUE_ERROR (ecma_op_object_get_length (obj_p, &len)))
   {
     return NULL;
@@ -1107,18 +1108,69 @@ ecma_op_create_list_from_array_like (ecma_value_t arr,  /**< array value */
   /* 6. */
   ecma_collection_t *list_ptr = ecma_new_collection ();
 
+  if (!(options & ECMA_FROM_ARRAY_LIKE_ONLY_PROP_NAMES))
+  {
+    /* 7. 8. */
+    for (ecma_length_t idx = 0; idx < len; idx++)
+    {
+      ecma_value_t next = ecma_op_object_get_by_index (obj_p, idx);
+
+      if (ECMA_IS_VALUE_ERROR (next))
+      {
+        ecma_collection_free (list_ptr);
+        return NULL;
+      }
+
+      ecma_collection_push_back (list_ptr, next);
+    }
+
+    /* 9. */
+    return list_ptr;
+  }
+
   /* 7. 8. */
   for (ecma_length_t idx = 0; idx < len; idx++)
   {
     ecma_value_t next = ecma_op_object_get_by_index (obj_p, idx);
+
     if (ECMA_IS_VALUE_ERROR (next))
     {
       ecma_collection_free (list_ptr);
       return NULL;
     }
 
-    if (prop_names_only
-        && !ecma_is_value_prop_name (next))
+    if (ecma_is_value_string (next))
+    {
+      jerry_property_filter_t non_symbol_mask = (JERRY_PROPERTY_FILTER_EXLCUDE_STRINGS
+                                                 | JERRY_PROPERTY_FILTER_EXLCUDE_INTEGER_INDICES);
+
+      if (options & non_symbol_mask)
+      {
+        if ((options & non_symbol_mask) == non_symbol_mask)
+        {
+          ecma_free_value (next);
+          continue;
+        }
+
+        uint32_t index = ecma_string_get_array_index (ecma_get_string_from_value (next));
+
+        if ((index != ECMA_STRING_NOT_ARRAY_INDEX && (options & JERRY_PROPERTY_FILTER_EXLCUDE_INTEGER_INDICES))
+            || (index == ECMA_STRING_NOT_ARRAY_INDEX && (options & JERRY_PROPERTY_FILTER_EXLCUDE_STRINGS)))
+        {
+          ecma_free_value (next);
+          continue;
+        }
+      }
+    }
+    else if (ecma_is_value_symbol (next))
+    {
+      if (options & JERRY_PROPERTY_FILTER_EXLCUDE_SYMBOLS)
+      {
+        ecma_free_value (next);
+        continue;
+      }
+    }
+    else
     {
       ecma_free_value (next);
       ecma_collection_free (list_ptr);
@@ -1132,6 +1184,7 @@ ecma_op_create_list_from_array_like (ecma_value_t arr,  /**< array value */
   /* 9. */
   return list_ptr;
 } /* ecma_op_create_list_from_array_like */
+
 #endif /* JERRY_ESNEXT */
 
 /**

jerry-core/ecma/operations/ecma-conversion.h

@@ -47,6 +47,23 @@ typedef enum
   ECMA_TO_NUMERIC_ALLOW_BIGINT = (1 << 0), /**< allow BigInt values (ignored if BigInts are disabled) */
 } ecma_to_numeric_options_t;
 
+#if JERRY_ESNEXT
+
+/**
+ * Option bits for ecma_op_create_list_from_array_like.
+ */
+typedef enum
+{
+  ECMA_FROM_ARRAY_LIKE_ANY = 0, /**< copy all items of the array */
+  ECMA_FROM_ARRAY_LIKE_ONLY_PROP_NAMES = (1 << 0), /**< only property names allowed */
+  /* Further options: */
+  /* JERRY_PROPERTY_FILTER_EXLCUDE_STRINGS */
+  /* JERRY_PROPERTY_FILTER_EXLCUDE_SYMBOLS */
+  /* JERRY_PROPERTY_FILTER_EXLCUDE_INTEGER_INDICES */
+} ecma_from_array_like_options_t;
+
+#endif /* JERRY_ESNEXT */
+
 bool ecma_op_require_object_coercible (ecma_value_t value);
 bool ecma_op_same_value (ecma_value_t x, ecma_value_t y);
 #if JERRY_BUILTIN_CONTAINER
@@ -64,7 +81,7 @@ ecma_value_t ecma_op_to_integer (ecma_value_t value, ecma_number_t *number_p);
 ecma_value_t ecma_op_to_length (ecma_value_t value, ecma_length_t *length);
 #if JERRY_ESNEXT
 ecma_value_t ecma_op_to_index (ecma_value_t value, ecma_number_t *index);
-ecma_collection_t *ecma_op_create_list_from_array_like (ecma_value_t arr, bool prop_names_only);
+ecma_collection_t *ecma_op_create_list_from_array_like (ecma_value_t arr, uint32_t options);
 #endif /* JERRY_ESNEXT */
 
 ecma_object_t *ecma_op_from_property_descriptor (const ecma_property_descriptor_t *src_prop_desc_p);