Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 77cb72a

Browse files
zherczegzherczeg
committedSep 21, 2021
Implement built-in flag support for arguments
Duplicate check can be removed from property enumeration. JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg zherczeg.u-szeged@partner.samsung.com
1 parent 053bfa0 commit 77cb72a

File tree

5 files changed

+147
-164
lines changed

5 files changed

+147
-164
lines changed
 

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -223,13 +223,14 @@ enum
223223
ECMA_VALUE_SPREAD_ELEMENT = ECMA_MAKE_VALUE (11), /**< a special value for spread elements in array initialization
224224
* or function call argument list */
225225
/* Other values */
226-
ECMA_VALUE_INITIALIZED = ECMA_MAKE_VALUE (12), /**< represents initialized mapped arguments formal parameter */
226+
ECMA_VALUE_ARGUMENT_INITIALIZED = ECMA_MAKE_VALUE (12), /**< represents initialized arguments formal parameter */
227+
ECMA_VALUE_ARGUMENT_NO_TRACK = ECMA_MAKE_VALUE (13), /**< represents not-tracked arguments formal parameter */
227228
#if JERRY_ESNEXT
228-
ECMA_VALUE_SYNC_ITERATOR = ECMA_MAKE_VALUE (13), /**< option for ecma_op_get_iterator: sync iterator is requested */
229-
ECMA_VALUE_ASYNC_ITERATOR = ECMA_MAKE_VALUE (14), /**< option for ecma_op_get_iterator: async iterator is requested */
229+
ECMA_VALUE_SYNC_ITERATOR = ECMA_MAKE_VALUE (14), /**< option for ecma_op_get_iterator: sync iterator is requested */
230+
ECMA_VALUE_ASYNC_ITERATOR = ECMA_MAKE_VALUE (15), /**< option for ecma_op_get_iterator: async iterator is requested */
230231
#endif /* JERRY_ESNEXT */
231232
#if JERRY_BUILTIN_GLOBAL_THIS
232-
ECMA_VALUE_GLOBAL_THIS = ECMA_MAKE_VALUE (15), /**< globalThis built-in */
233+
ECMA_VALUE_GLOBAL_THIS = ECMA_MAKE_VALUE (16), /**< globalThis built-in */
233234
#endif /* JERRY_BUILTIN_GLOBAL_THIS */
234235
};
235236

@@ -2452,9 +2453,8 @@ typedef enum
24522453
ECMA_ARGUMENTS_OBJECT_MAPPED = (1 << 0), /* mapped arguments object */
24532454
ECMA_ARGUMENTS_OBJECT_STATIC_BYTECODE = (1 << 1), /* static mapped arguments object */
24542455
ECMA_ARGUMENTS_OBJECT_CALLEE_INITIALIZED = (1 << 2), /* 'callee' property has been lazy initialized */
2455-
ECMA_ARGUMENTS_OBJECT_CALLER_INITIALIZED = (1 << 3), /* 'caller' property has been lazy initialized */
2456-
ECMA_ARGUMENTS_OBJECT_LENGTH_INITIALIZED = (1 << 4), /* 'length' property has been lazy initialized */
2457-
ECMA_ARGUMENTS_OBJECT_ITERATOR_INITIALIZED = (1 << 5), /* 'Symbol.iterator' property has been lazy initialized */
2456+
ECMA_ARGUMENTS_OBJECT_LENGTH_INITIALIZED = (1 << 3), /* 'length' property has been lazy initialized */
2457+
ECMA_ARGUMENTS_OBJECT_ITERATOR_INITIALIZED = (1 << 4), /* 'Symbol.iterator' property has been lazy initialized */
24582458
} ecma_arguments_object_flags_t;
24592459

24602460
/**

‎jerry-core/ecma/operations/ecma-arguments-object.c

+103-103
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ ecma_op_create_arguments_object (vm_frame_ctx_shared_args_t *shared_p, /**< shar
8888

8989
for (uint32_t i = shared_p->arg_list_len; i < saved_arg_count; i++)
9090
{
91-
argv_p[i] = ECMA_VALUE_INITIALIZED;
91+
argv_p[i] = ECMA_VALUE_ARGUMENT_INITIALIZED;
9292
}
9393

9494
arguments_p->header.u.cls.u3.arguments_number = shared_p->arg_list_len;
@@ -137,7 +137,7 @@ ecma_op_create_arguments_object (vm_frame_ctx_shared_args_t *shared_p, /**< shar
137137

138138
ecma_deref_ecma_string (prop_name_p);
139139

140-
prop_value_p->value = argv_p[i] == ECMA_VALUE_INITIALIZED ? ECMA_VALUE_UNDEFINED : argv_p[i];
140+
prop_value_p->value = (argv_p[i] == ECMA_VALUE_ARGUMENT_INITIALIZED) ? ECMA_VALUE_UNDEFINED : argv_p[i];
141141
argv_p[i] = ECMA_VALUE_EMPTY;
142142
}
143143
}
@@ -183,76 +183,40 @@ ecma_op_arguments_object_define_own_property (ecma_object_t *object_p, /**< the
183183

184184
ecma_value_t *argv_p = (ecma_value_t *) (mapped_arguments_p + 1);
185185

186-
if (!ecma_is_value_empty (argv_p[index]))
186+
if (ecma_is_value_empty (argv_p[index]) || argv_p[index] == ECMA_VALUE_ARGUMENT_NO_TRACK)
187187
{
188-
if (property_desc_p->flags & (JERRY_PROP_IS_GET_DEFINED | JERRY_PROP_IS_SET_DEFINED))
189-
{
190-
ecma_free_value_if_not_object (argv_p[index]);
191-
argv_p[index] = ECMA_VALUE_EMPTY;
192-
}
193-
else
194-
{
195-
if (property_desc_p->flags & JERRY_PROP_IS_VALUE_DEFINED)
196-
{
197-
ecma_string_t *name_p = ecma_op_arguments_object_get_formal_parameter (mapped_arguments_p, index);
198-
ecma_object_t *lex_env_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_object_t, mapped_arguments_p->lex_env);
199-
200-
ecma_value_t completion = ecma_op_set_mutable_binding (lex_env_p,
201-
name_p,
202-
property_desc_p->value,
203-
true);
204-
205-
JERRY_ASSERT (ecma_is_value_empty (completion));
206-
}
207-
208-
if ((property_desc_p->flags & JERRY_PROP_IS_WRITABLE_DEFINED)
209-
&& !(property_desc_p->flags & JERRY_PROP_IS_WRITABLE))
210-
{
211-
ecma_free_value_if_not_object (argv_p[index]);
212-
argv_p[index] = ECMA_VALUE_EMPTY;
213-
}
214-
}
188+
return ret_value;
215189
}
216190

217-
return ret_value;
218-
} /* ecma_op_arguments_object_define_own_property */
219-
220-
/**
221-
* [[Delete]] ecma Arguments object's operation
222-
*
223-
* See also:
224-
* ECMA-262 v5, 8.6.2; ECMA-262 v5, Table 8
225-
* ECMA-262 v5, 10.6
226-
*
227-
* @return ecma value
228-
* Returned value must be freed with ecma_free_value
229-
*/
230-
ecma_value_t
231-
ecma_op_arguments_object_delete (ecma_object_t *object_p, /**< the object */
232-
ecma_string_t *property_name_p, /**< property name */
233-
bool is_throw) /**< flag that controls failure handling */
234-
{
235-
/* 3. */
236-
ecma_value_t ret_value = ecma_op_general_object_delete (object_p, property_name_p, is_throw);
237-
238-
if (!ecma_is_value_true (ret_value)
239-
|| !(((ecma_extended_object_t *) object_p)->u.cls.u1.arguments_flags & ECMA_ARGUMENTS_OBJECT_MAPPED))
191+
if (property_desc_p->flags & (JERRY_PROP_IS_GET_DEFINED | JERRY_PROP_IS_SET_DEFINED))
240192
{
193+
ecma_free_value_if_not_object (argv_p[index]);
194+
argv_p[index] = ECMA_VALUE_ARGUMENT_NO_TRACK;
241195
return ret_value;
242196
}
243197

244-
ecma_mapped_arguments_t *mapped_arguments_p = (ecma_mapped_arguments_t *) object_p;
245-
ecma_value_t *argv_p = (ecma_value_t *) (mapped_arguments_p + 1);
246-
uint32_t index = ecma_string_get_array_index (property_name_p);
198+
if (property_desc_p->flags & JERRY_PROP_IS_VALUE_DEFINED)
199+
{
200+
ecma_string_t *name_p = ecma_op_arguments_object_get_formal_parameter (mapped_arguments_p, index);
201+
ecma_object_t *lex_env_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_object_t, mapped_arguments_p->lex_env);
202+
203+
ecma_value_t completion = ecma_op_set_mutable_binding (lex_env_p,
204+
name_p,
205+
property_desc_p->value,
206+
true);
247207

248-
if (index < mapped_arguments_p->unmapped.header.u.cls.u2.formal_params_number)
208+
JERRY_ASSERT (ecma_is_value_empty (completion));
209+
}
210+
211+
if ((property_desc_p->flags & JERRY_PROP_IS_WRITABLE_DEFINED)
212+
&& !(property_desc_p->flags & JERRY_PROP_IS_WRITABLE))
249213
{
250214
ecma_free_value_if_not_object (argv_p[index]);
251-
argv_p[index] = ECMA_VALUE_EMPTY;
215+
argv_p[index] = ECMA_VALUE_ARGUMENT_NO_TRACK;
252216
}
253217

254218
return ret_value;
255-
} /* ecma_op_arguments_object_delete */
219+
} /* ecma_op_arguments_object_define_own_property */
256220

257221
/**
258222
* Try to lazy instantiate the given property of a mapped/unmapped arguments object
@@ -269,7 +233,7 @@ ecma_op_arguments_object_try_to_lazy_instantiate_property (ecma_object_t *object
269233
ecma_unmapped_arguments_t *arguments_p = (ecma_unmapped_arguments_t *) object_p;
270234
ecma_value_t *argv_p = (ecma_value_t *) (arguments_p + 1);
271235
ecma_property_value_t *prop_value_p;
272-
ecma_property_t *prop_p = NULL;
236+
ecma_property_t *prop_p;
273237
uint32_t arguments_number = arguments_p->header.u.cls.u3.arguments_number;
274238
uint8_t flags = arguments_p->header.u.cls.u1.arguments_flags;
275239

@@ -283,57 +247,46 @@ ecma_op_arguments_object_try_to_lazy_instantiate_property (ecma_object_t *object
283247
if (index != ECMA_STRING_NOT_ARRAY_INDEX)
284248
{
285249
if (index >= arguments_number
286-
|| ecma_is_value_empty (argv_p[index])
287-
|| argv_p[index] == ECMA_VALUE_INITIALIZED)
250+
|| ecma_is_value_empty (argv_p[index]))
288251
{
289252
return NULL;
290253
}
291254

255+
JERRY_ASSERT (argv_p[index] != ECMA_VALUE_ARGUMENT_INITIALIZED
256+
&& argv_p[index] != ECMA_VALUE_ARGUMENT_NO_TRACK);
257+
292258
prop_value_p = ecma_create_named_data_property (object_p,
293259
property_name_p,
294-
ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE,
260+
ECMA_PROPERTY_BUILT_IN_CONFIGURABLE_ENUMERABLE_WRITABLE,
295261
&prop_p);
296262

297263
/* Passing the reference */
298264
prop_value_p->value = argv_p[index];
299265

300-
/* Pevent reinitialization */
301-
if ((flags & ECMA_ARGUMENTS_OBJECT_MAPPED)
302-
&& index < arguments_p->header.u.cls.u2.formal_params_number)
303-
{
304-
argv_p[index] = ECMA_VALUE_INITIALIZED;
305-
}
306-
else
307-
{
308-
argv_p[index] = ECMA_VALUE_EMPTY;
309-
}
310-
266+
argv_p[index] = ECMA_VALUE_ARGUMENT_INITIALIZED;
311267
return prop_p;
312268
}
313269

314-
if (property_name_p == ecma_get_magic_string (LIT_MAGIC_STRING_LENGTH)
270+
if (ecma_compare_ecma_string_to_magic_id (property_name_p, LIT_MAGIC_STRING_LENGTH)
315271
&& !(flags & ECMA_ARGUMENTS_OBJECT_LENGTH_INITIALIZED))
316272
{
317-
arguments_p->header.u.cls.u1.arguments_flags |= ECMA_ARGUMENTS_OBJECT_LENGTH_INITIALIZED;
318-
319273
prop_value_p = ecma_create_named_data_property (object_p,
320274
ecma_get_magic_string (LIT_MAGIC_STRING_LENGTH),
321-
ECMA_PROPERTY_CONFIGURABLE_WRITABLE,
275+
ECMA_PROPERTY_BUILT_IN_CONFIGURABLE_WRITABLE,
322276
&prop_p);
323277

324278
prop_value_p->value = ecma_make_uint32_value (arguments_number);
279+
return prop_p;
325280
}
326281

327-
if (property_name_p == ecma_get_magic_string (LIT_MAGIC_STRING_CALLEE)
282+
if (ecma_compare_ecma_string_to_magic_id (property_name_p, LIT_MAGIC_STRING_CALLEE)
328283
&& !(flags & ECMA_ARGUMENTS_OBJECT_CALLEE_INITIALIZED))
329284
{
330-
arguments_p->header.u.cls.u1.arguments_flags |= ECMA_ARGUMENTS_OBJECT_CALLEE_INITIALIZED;
331-
332285
if (flags & ECMA_ARGUMENTS_OBJECT_MAPPED)
333286
{
334287
prop_value_p = ecma_create_named_data_property (object_p,
335288
property_name_p,
336-
ECMA_PROPERTY_CONFIGURABLE_WRITABLE,
289+
ECMA_PROPERTY_BUILT_IN_CONFIGURABLE_WRITABLE,
337290
&prop_p);
338291

339292
prop_value_p->value = arguments_p->callee;
@@ -346,75 +299,120 @@ ecma_op_arguments_object_try_to_lazy_instantiate_property (ecma_object_t *object
346299
ecma_get_magic_string (LIT_MAGIC_STRING_CALLEE),
347300
thrower_p,
348301
thrower_p,
349-
ECMA_PROPERTY_FIXED,
302+
ECMA_PROPERTY_BUILT_IN_FIXED,
350303
&prop_p);
351304
}
352305
return prop_p;
353306
}
354307

355308
#if !JERRY_ESNEXT
356-
if (property_name_p == ecma_get_magic_string (LIT_MAGIC_STRING_CALLER)
357-
&& !(arguments_p->header.u.cls.u1.arguments_flags & ECMA_ARGUMENTS_OBJECT_CALLER_INITIALIZED))
309+
if (property_name_p == ecma_get_magic_string (LIT_MAGIC_STRING_CALLER))
358310
{
359311
if (arguments_p->header.u.cls.u1.arguments_flags & ECMA_ARGUMENTS_OBJECT_MAPPED)
360312
{
361313
return NULL;
362314
}
363315

364-
arguments_p->header.u.cls.u1.arguments_flags |= ECMA_ARGUMENTS_OBJECT_CALLER_INITIALIZED;
365-
366316
ecma_object_t *thrower_p = ecma_builtin_get (ECMA_BUILTIN_ID_TYPE_ERROR_THROWER);
367317

368318
ecma_create_named_accessor_property (object_p,
369319
ecma_get_magic_string (LIT_MAGIC_STRING_CALLER),
370320
thrower_p,
371321
thrower_p,
372-
ECMA_PROPERTY_FIXED,
322+
ECMA_PROPERTY_BUILT_IN_FIXED,
373323
&prop_p);
374324
return prop_p;
375325
}
376326
#else /* JERRY_ESNEXT */
377-
ecma_string_t *symbol_p = ecma_op_get_global_symbol (LIT_GLOBAL_SYMBOL_ITERATOR);
378-
379-
if (property_name_p == symbol_p
327+
if (ecma_op_compare_string_to_global_symbol (property_name_p, LIT_GLOBAL_SYMBOL_ITERATOR)
380328
&& !(flags & ECMA_ARGUMENTS_OBJECT_ITERATOR_INITIALIZED))
381329
{
382-
arguments_p->header.u.cls.u1.arguments_flags |= ECMA_ARGUMENTS_OBJECT_ITERATOR_INITIALIZED;
383-
384330
prop_value_p = ecma_create_named_data_property (object_p,
385-
symbol_p,
386-
ECMA_PROPERTY_CONFIGURABLE_WRITABLE,
331+
property_name_p,
332+
ECMA_PROPERTY_BUILT_IN_CONFIGURABLE_WRITABLE,
387333
&prop_p);
388334

389335
prop_value_p->value = ecma_op_object_get_by_magic_id (ecma_builtin_get (ECMA_BUILTIN_ID_INTRINSIC_OBJECT),
390336
LIT_INTERNAL_MAGIC_STRING_ARRAY_PROTOTYPE_VALUES);
391337

392338
JERRY_ASSERT (ecma_is_value_object (prop_value_p->value));
393339
ecma_deref_object (ecma_get_object_from_value (prop_value_p->value));
340+
return prop_p;
394341
}
395-
396-
ecma_deref_ecma_string (symbol_p);
397342
#endif /* !JERRY_ESNEXT */
398343

399-
return prop_p;
344+
return NULL;
400345
} /* ecma_op_arguments_object_try_to_lazy_instantiate_property */
401346

347+
/**
348+
* Delete configurable properties of arguments object
349+
*/
350+
void
351+
ecma_op_arguments_delete_built_in_property (ecma_object_t *object_p, /**< the object */
352+
ecma_string_t *property_name_p) /**< property name */
353+
{
354+
ecma_unmapped_arguments_t *arguments_p = (ecma_unmapped_arguments_t *) object_p;
355+
356+
if (ecma_compare_ecma_string_to_magic_id (property_name_p, LIT_MAGIC_STRING_LENGTH))
357+
{
358+
JERRY_ASSERT (!(arguments_p->header.u.cls.u1.arguments_flags & ECMA_ARGUMENTS_OBJECT_LENGTH_INITIALIZED));
359+
360+
arguments_p->header.u.cls.u1.arguments_flags |= ECMA_ARGUMENTS_OBJECT_LENGTH_INITIALIZED;
361+
return;
362+
}
363+
364+
if (ecma_compare_ecma_string_to_magic_id (property_name_p, LIT_MAGIC_STRING_CALLEE))
365+
{
366+
JERRY_ASSERT (!(arguments_p->header.u.cls.u1.arguments_flags & ECMA_ARGUMENTS_OBJECT_CALLEE_INITIALIZED));
367+
JERRY_ASSERT (arguments_p->header.u.cls.u1.arguments_flags & ECMA_ARGUMENTS_OBJECT_MAPPED);
368+
369+
arguments_p->header.u.cls.u1.arguments_flags |= ECMA_ARGUMENTS_OBJECT_CALLEE_INITIALIZED;
370+
return;
371+
}
372+
373+
#if JERRY_ESNEXT
374+
if (ecma_prop_name_is_symbol (property_name_p))
375+
{
376+
JERRY_ASSERT (!(arguments_p->header.u.cls.u1.arguments_flags & ECMA_ARGUMENTS_OBJECT_ITERATOR_INITIALIZED));
377+
JERRY_ASSERT (ecma_op_compare_string_to_global_symbol (property_name_p, LIT_GLOBAL_SYMBOL_ITERATOR));
378+
379+
arguments_p->header.u.cls.u1.arguments_flags |= ECMA_ARGUMENTS_OBJECT_ITERATOR_INITIALIZED;
380+
return;
381+
}
382+
#endif /* JERRY_ESNEXT */
383+
384+
uint32_t index = ecma_string_get_array_index (property_name_p);
385+
386+
ecma_value_t *argv_p = (ecma_value_t *) (arguments_p + 1);
387+
388+
if (arguments_p->header.u.cls.u1.arguments_flags & ECMA_ARGUMENTS_OBJECT_MAPPED)
389+
{
390+
argv_p = (ecma_value_t *) (((ecma_mapped_arguments_t *) object_p) + 1);
391+
}
392+
393+
JERRY_ASSERT (argv_p[index] == ECMA_VALUE_ARGUMENT_INITIALIZED
394+
|| argv_p[index] == ECMA_VALUE_ARGUMENT_NO_TRACK);
395+
396+
argv_p[index] = ECMA_VALUE_EMPTY;
397+
} /* ecma_op_arguments_delete_built_in_property */
398+
402399
/**
403400
* List names of an arguments object's lazy instantiated properties
404401
*/
405402
void
406403
ecma_op_arguments_object_list_lazy_property_names (ecma_object_t *obj_p, /**< arguments object */
407404
ecma_collection_t *prop_names_p, /**< prop name collection */
408-
ecma_property_counter_t *prop_counter_p) /**< prop counter */
405+
ecma_property_counter_t *prop_counter_p) /**< property counters */
409406
{
410407
JERRY_ASSERT (ecma_object_class_is (obj_p, ECMA_OBJECT_CLASS_ARGUMENTS));
411408

412409
ecma_unmapped_arguments_t *arguments_p = (ecma_unmapped_arguments_t *) obj_p;
413410

414-
ecma_value_t *argv_p = (ecma_value_t *) (arguments_p + 1);
415411
uint32_t arguments_number = arguments_p->header.u.cls.u3.arguments_number;
416412
uint8_t flags = arguments_p->header.u.cls.u1.arguments_flags;
417413

414+
ecma_value_t *argv_p = (ecma_value_t *) (arguments_p + 1);
415+
418416
if (flags & ECMA_ARGUMENTS_OBJECT_MAPPED)
419417
{
420418
argv_p = (ecma_value_t *) (((ecma_mapped_arguments_t *) obj_p) + 1);
@@ -443,19 +441,21 @@ ecma_op_arguments_object_list_lazy_property_names (ecma_object_t *obj_p, /**< ar
443441
}
444442

445443
#if !JERRY_ESNEXT
446-
if (!(flags & (ECMA_ARGUMENTS_OBJECT_CALLER_INITIALIZED | ECMA_ARGUMENTS_OBJECT_MAPPED)))
444+
if (!(flags & ECMA_ARGUMENTS_OBJECT_MAPPED))
447445
{
448446
ecma_collection_push_back (prop_names_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_CALLER));
449447
prop_counter_p->string_named_props++;
450448
}
451-
#else /* JERRY_ESNEXT */
449+
#endif /* !JERRY_ESNEXT */
450+
451+
#if JERRY_ESNEXT
452452
if (!(flags & ECMA_ARGUMENTS_OBJECT_ITERATOR_INITIALIZED))
453453
{
454454
ecma_string_t *symbol_p = ecma_op_get_global_symbol (LIT_GLOBAL_SYMBOL_ITERATOR);
455455
ecma_collection_push_back (prop_names_p, ecma_make_symbol_value (symbol_p));
456456
prop_counter_p->symbol_named_props++;
457457
}
458-
#endif /* !JERRY_ESNEXT */
458+
#endif /* JERRY_ESNEXT */
459459
} /* ecma_op_arguments_object_list_lazy_property_names */
460460

461461
/**

‎jerry-core/ecma/operations/ecma-arguments-object.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
ecma_value_t
2424
ecma_op_create_arguments_object (vm_frame_ctx_shared_args_t *shared_p, ecma_object_t *lex_env_p);
2525

26-
ecma_value_t
27-
ecma_op_arguments_object_delete (ecma_object_t *object_p, ecma_string_t *property_name_p, bool is_throw);
2826
ecma_value_t
2927
ecma_op_arguments_object_define_own_property (ecma_object_t *object_p, ecma_string_t *property_name_p,
3028
const ecma_property_descriptor_t *property_desc_p);
@@ -34,8 +32,10 @@ ecma_op_arguments_object_try_to_lazy_instantiate_property (ecma_object_t *object
3432
ecma_string_t *property_name_p);
3533

3634
void
37-
ecma_op_arguments_object_list_lazy_property_names (ecma_object_t *obj_p,
38-
ecma_collection_t *prop_names_p,
35+
ecma_op_arguments_delete_built_in_property (ecma_object_t *object_p, ecma_string_t *property_name_p);
36+
37+
void
38+
ecma_op_arguments_object_list_lazy_property_names (ecma_object_t *obj_p, ecma_collection_t *prop_names_p,
3939
ecma_property_counter_t *prop_counter_p);
4040

4141
ecma_string_t *

‎jerry-core/ecma/operations/ecma-objects-general.c

+16-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* limitations under the License.
1414
*/
1515

16+
#include "ecma-arguments-object.h"
1617
#include "ecma-array-object.h"
1718
#include "ecma-builtins.h"
1819
#include "ecma-exceptions.h"
@@ -151,6 +152,12 @@ ecma_op_general_object_delete (ecma_object_t *obj_p, /**< the object */
151152
ecma_builtin_delete_built_in_property (obj_p, property_name_p);
152153
break;
153154
}
155+
case ECMA_OBJECT_TYPE_CLASS:
156+
{
157+
JERRY_ASSERT (ecma_object_class_is (obj_p, ECMA_OBJECT_CLASS_ARGUMENTS));
158+
ecma_op_arguments_delete_built_in_property (obj_p, property_name_p);
159+
break;
160+
}
154161
case ECMA_OBJECT_TYPE_FUNCTION:
155162
{
156163
ecma_op_function_delete_built_in_property (obj_p, property_name_p);
@@ -168,7 +175,15 @@ ecma_op_general_object_delete (ecma_object_t *obj_p, /**< the object */
168175
}
169176
}
170177
#else /* !JERRY_ESNEXT */
171-
ecma_builtin_delete_built_in_property (obj_p, property_name_p);
178+
if (type == ECMA_OBJECT_TYPE_CLASS)
179+
{
180+
JERRY_ASSERT (ecma_object_class_is (obj_p, ECMA_OBJECT_CLASS_ARGUMENTS));
181+
ecma_op_arguments_delete_built_in_property (obj_p, property_name_p);
182+
}
183+
else
184+
{
185+
ecma_builtin_delete_built_in_property (obj_p, property_name_p);
186+
}
172187
#endif /* JERRY_ESNEXT */
173188
}
174189

‎jerry-core/ecma/operations/ecma-objects.c

+17-49
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,8 @@ ecma_op_object_get_own_property (ecma_object_t *object_p, /**< the object */
390390

391391
ecma_value_t *argv_p = (ecma_value_t *) (mapped_arguments_p + 1);
392392

393-
if (!ecma_is_value_empty (argv_p[index]))
393+
if (!ecma_is_value_empty (argv_p[index])
394+
&& argv_p[index] != ECMA_VALUE_ARGUMENT_NO_TRACK)
394395
{
395396
#if JERRY_LCACHE
396397
/* Mapped arguments initialized properties MUST not be lcached */
@@ -585,7 +586,8 @@ ecma_op_object_find_own (ecma_value_t base_value, /**< base value */
585586

586587
ecma_value_t *argv_p = (ecma_value_t *) (mapped_arguments_p + 1);
587588

588-
if (!ecma_is_value_empty (argv_p[index]))
589+
if (!ecma_is_value_empty (argv_p[index])
590+
&& argv_p[index] != ECMA_VALUE_ARGUMENT_NO_TRACK)
589591
{
590592
ecma_string_t *name_p = ecma_op_arguments_object_get_formal_parameter (mapped_arguments_p, index);
591593
ecma_object_t *lex_env_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_object_t, mapped_arguments_p->lex_env);
@@ -1428,7 +1430,8 @@ ecma_op_object_put_with_receiver (ecma_object_t *object_p, /**< the object */
14281430

14291431
ecma_value_t *argv_p = (ecma_value_t *) (mapped_arguments_p + 1);
14301432

1431-
if (!ecma_is_value_empty (argv_p[index]))
1433+
if (!ecma_is_value_empty (argv_p[index])
1434+
&& argv_p[index] != ECMA_VALUE_ARGUMENT_NO_TRACK)
14321435
{
14331436
ecma_string_t *name_p = ecma_op_arguments_object_get_formal_parameter (mapped_arguments_p, index);
14341437
ecma_object_t *lex_env_p = ECMA_GET_INTERNAL_VALUE_POINTER (ecma_object_t, mapped_arguments_p->lex_env);
@@ -1812,13 +1815,6 @@ ecma_op_object_delete (ecma_object_t *obj_p, /**< the object */
18121815
&& !ecma_is_lexical_environment (obj_p));
18131816
JERRY_ASSERT (property_name_p != NULL);
18141817

1815-
if (ecma_object_class_is (obj_p, ECMA_OBJECT_CLASS_ARGUMENTS))
1816-
{
1817-
return ecma_op_arguments_object_delete (obj_p,
1818-
property_name_p,
1819-
is_strict);
1820-
}
1821-
18221818
#if JERRY_BUILTIN_PROXY
18231819
if (ECMA_OBJECT_IS_PROXY (obj_p))
18241820
{
@@ -2279,27 +2275,6 @@ ecma_op_object_get_enumerable_property_names (ecma_object_t *obj_p, /**< routine
22792275
return properties_p;
22802276
} /* ecma_op_object_get_enumerable_property_names */
22812277

2282-
/**
2283-
* Helper method to check if a given property is already in the collection or not
2284-
*
2285-
* @return true - if the property is already in the collection
2286-
* false - otherwise
2287-
*/
2288-
static bool
2289-
ecma_object_prop_name_is_duplicated (ecma_collection_t *prop_names_p, /**< prop name collection */
2290-
ecma_string_t *name_p) /**< property name */
2291-
{
2292-
for (uint64_t i = 0; i < prop_names_p->item_count; i++)
2293-
{
2294-
if (ecma_compare_ecma_strings (ecma_get_prop_name_from_value (prop_names_p->buffer_p[i]), name_p))
2295-
{
2296-
return true;
2297-
}
2298-
}
2299-
2300-
return false;
2301-
} /* ecma_object_prop_name_is_duplicated */
2302-
23032278
/**
23042279
* Helper method for getting lazy instantiated properties for [[OwnPropertyKeys]]
23052280
*/
@@ -2574,29 +2549,22 @@ ecma_op_object_own_property_keys (ecma_object_t *obj_p) /**< object */
25742549
ecma_string_t *name_p = ecma_string_from_property_name (*property_p,
25752550
prop_pair_p->names_cp[i]);
25762551

2577-
if (!ecma_object_prop_name_is_duplicated (prop_names_p, name_p))
2552+
if (ecma_string_get_array_index (name_p) != ECMA_STRING_NOT_ARRAY_INDEX)
25782553
{
2579-
if (ecma_string_get_array_index (name_p) != ECMA_STRING_NOT_ARRAY_INDEX)
2580-
{
2581-
prop_counter.array_index_named_props++;
2582-
}
2583-
#if JERRY_ESNEXT
2584-
else if (ecma_prop_name_is_symbol (name_p))
2585-
{
2586-
prop_counter.symbol_named_props++;
2587-
}
2588-
#endif /* JERRY_ESNEXT */
2589-
else
2590-
{
2591-
prop_counter.string_named_props++;
2592-
}
2593-
2594-
ecma_collection_push_back (prop_names_p, ecma_make_prop_name_value (name_p));
2554+
prop_counter.array_index_named_props++;
25952555
}
2556+
#if JERRY_ESNEXT
2557+
else if (ecma_prop_name_is_symbol (name_p))
2558+
{
2559+
prop_counter.symbol_named_props++;
2560+
}
2561+
#endif /* JERRY_ESNEXT */
25962562
else
25972563
{
2598-
ecma_deref_ecma_string (name_p);
2564+
prop_counter.string_named_props++;
25992565
}
2566+
2567+
ecma_collection_push_back (prop_names_p, ecma_make_prop_name_value (name_p));
26002568
}
26012569
}
26022570

0 commit comments

Comments
 (0)
Please sign in to comment.