Skip to content

Commit 3a788a2

Browse files
zherczegzherczeg
committed
Implement built-in flag support for arguments
Duplicate check can be removed from property enumeration. JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg [email protected]
1 parent 053bfa0 commit 3a788a2

File tree

5 files changed

+139
-161
lines changed

5 files changed

+139
-161
lines changed

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ 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_NO_TRACK = ECMA_MAKE_VALUE (12), /**< represents not-tracked arguments formal parameter */
227227
#if JERRY_ESNEXT
228228
ECMA_VALUE_SYNC_ITERATOR = ECMA_MAKE_VALUE (13), /**< option for ecma_op_get_iterator: sync iterator is requested */
229229
ECMA_VALUE_ASYNC_ITERATOR = ECMA_MAKE_VALUE (14), /**< option for ecma_op_get_iterator: async iterator is requested */
@@ -2452,9 +2452,8 @@ typedef enum
24522452
ECMA_ARGUMENTS_OBJECT_MAPPED = (1 << 0), /* mapped arguments object */
24532453
ECMA_ARGUMENTS_OBJECT_STATIC_BYTECODE = (1 << 1), /* static mapped arguments object */
24542454
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 */
2455+
ECMA_ARGUMENTS_OBJECT_LENGTH_INITIALIZED = (1 << 3), /* 'length' property has been lazy initialized */
2456+
ECMA_ARGUMENTS_OBJECT_ITERATOR_INITIALIZED = (1 << 4), /* 'Symbol.iterator' property has been lazy initialized */
24582457
} ecma_arguments_object_flags_t;
24592458

24602459
/**

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

+102-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_UNDEFINED;
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];
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,45 @@ 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_NO_TRACK);
256+
292257
prop_value_p = ecma_create_named_data_property (object_p,
293258
property_name_p,
294-
ECMA_PROPERTY_CONFIGURABLE_ENUMERABLE_WRITABLE,
259+
ECMA_PROPERTY_BUILT_IN_CONFIGURABLE_ENUMERABLE_WRITABLE,
295260
&prop_p);
296261

297262
/* Passing the reference */
298263
prop_value_p->value = argv_p[index];
299264

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-
265+
argv_p[index] = ECMA_VALUE_UNDEFINED;
311266
return prop_p;
312267
}
313268

314-
if (property_name_p == ecma_get_magic_string (LIT_MAGIC_STRING_LENGTH)
269+
if (ecma_compare_ecma_string_to_magic_id (property_name_p, LIT_MAGIC_STRING_LENGTH)
315270
&& !(flags & ECMA_ARGUMENTS_OBJECT_LENGTH_INITIALIZED))
316271
{
317-
arguments_p->header.u.cls.u1.arguments_flags |= ECMA_ARGUMENTS_OBJECT_LENGTH_INITIALIZED;
318-
319272
prop_value_p = ecma_create_named_data_property (object_p,
320273
ecma_get_magic_string (LIT_MAGIC_STRING_LENGTH),
321-
ECMA_PROPERTY_CONFIGURABLE_WRITABLE,
274+
ECMA_PROPERTY_BUILT_IN_CONFIGURABLE_WRITABLE,
322275
&prop_p);
323276

324277
prop_value_p->value = ecma_make_uint32_value (arguments_number);
278+
return prop_p;
325279
}
326280

327-
if (property_name_p == ecma_get_magic_string (LIT_MAGIC_STRING_CALLEE)
281+
if (ecma_compare_ecma_string_to_magic_id (property_name_p, LIT_MAGIC_STRING_CALLEE)
328282
&& !(flags & ECMA_ARGUMENTS_OBJECT_CALLEE_INITIALIZED))
329283
{
330-
arguments_p->header.u.cls.u1.arguments_flags |= ECMA_ARGUMENTS_OBJECT_CALLEE_INITIALIZED;
331-
332284
if (flags & ECMA_ARGUMENTS_OBJECT_MAPPED)
333285
{
334286
prop_value_p = ecma_create_named_data_property (object_p,
335287
property_name_p,
336-
ECMA_PROPERTY_CONFIGURABLE_WRITABLE,
288+
ECMA_PROPERTY_BUILT_IN_CONFIGURABLE_WRITABLE,
337289
&prop_p);
338290

339291
prop_value_p->value = arguments_p->callee;
@@ -346,75 +298,120 @@ ecma_op_arguments_object_try_to_lazy_instantiate_property (ecma_object_t *object
346298
ecma_get_magic_string (LIT_MAGIC_STRING_CALLEE),
347299
thrower_p,
348300
thrower_p,
349-
ECMA_PROPERTY_FIXED,
301+
ECMA_PROPERTY_BUILT_IN_FIXED,
350302
&prop_p);
351303
}
352304
return prop_p;
353305
}
354306

355307
#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))
308+
if (property_name_p == ecma_get_magic_string (LIT_MAGIC_STRING_CALLER))
358309
{
359310
if (arguments_p->header.u.cls.u1.arguments_flags & ECMA_ARGUMENTS_OBJECT_MAPPED)
360311
{
361312
return NULL;
362313
}
363314

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

368317
ecma_create_named_accessor_property (object_p,
369318
ecma_get_magic_string (LIT_MAGIC_STRING_CALLER),
370319
thrower_p,
371320
thrower_p,
372-
ECMA_PROPERTY_FIXED,
321+
ECMA_PROPERTY_BUILT_IN_FIXED,
373322
&prop_p);
374323
return prop_p;
375324
}
376325
#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
326+
if (ecma_op_compare_string_to_global_symbol (property_name_p, LIT_GLOBAL_SYMBOL_ITERATOR)
380327
&& !(flags & ECMA_ARGUMENTS_OBJECT_ITERATOR_INITIALIZED))
381328
{
382-
arguments_p->header.u.cls.u1.arguments_flags |= ECMA_ARGUMENTS_OBJECT_ITERATOR_INITIALIZED;
383-
384329
prop_value_p = ecma_create_named_data_property (object_p,
385-
symbol_p,
386-
ECMA_PROPERTY_CONFIGURABLE_WRITABLE,
330+
property_name_p,
331+
ECMA_PROPERTY_BUILT_IN_CONFIGURABLE_WRITABLE,
387332
&prop_p);
388333

389334
prop_value_p->value = ecma_op_object_get_by_magic_id (ecma_builtin_get (ECMA_BUILTIN_ID_INTRINSIC_OBJECT),
390335
LIT_INTERNAL_MAGIC_STRING_ARRAY_PROTOTYPE_VALUES);
391336

392337
JERRY_ASSERT (ecma_is_value_object (prop_value_p->value));
393338
ecma_deref_object (ecma_get_object_from_value (prop_value_p->value));
339+
return prop_p;
394340
}
395-
396-
ecma_deref_ecma_string (symbol_p);
397341
#endif /* !JERRY_ESNEXT */
398342

399-
return prop_p;
343+
return NULL;
400344
} /* ecma_op_arguments_object_try_to_lazy_instantiate_property */
401345

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

412408
ecma_unmapped_arguments_t *arguments_p = (ecma_unmapped_arguments_t *) obj_p;
413409

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

413+
ecma_value_t *argv_p = (ecma_value_t *) (arguments_p + 1);
414+
418415
if (flags & ECMA_ARGUMENTS_OBJECT_MAPPED)
419416
{
420417
argv_p = (ecma_value_t *) (((ecma_mapped_arguments_t *) obj_p) + 1);
@@ -443,19 +440,21 @@ ecma_op_arguments_object_list_lazy_property_names (ecma_object_t *obj_p, /**< ar
443440
}
444441

445442
#if !JERRY_ESNEXT
446-
if (!(flags & (ECMA_ARGUMENTS_OBJECT_CALLER_INITIALIZED | ECMA_ARGUMENTS_OBJECT_MAPPED)))
443+
if (!(flags & ECMA_ARGUMENTS_OBJECT_MAPPED))
447444
{
448445
ecma_collection_push_back (prop_names_p, ecma_make_magic_string_value (LIT_MAGIC_STRING_CALLER));
449446
prop_counter_p->string_named_props++;
450447
}
451-
#else /* JERRY_ESNEXT */
448+
#endif /* !JERRY_ESNEXT */
449+
450+
#if JERRY_ESNEXT
452451
if (!(flags & ECMA_ARGUMENTS_OBJECT_ITERATOR_INITIALIZED))
453452
{
454453
ecma_string_t *symbol_p = ecma_op_get_global_symbol (LIT_GLOBAL_SYMBOL_ITERATOR);
455454
ecma_collection_push_back (prop_names_p, ecma_make_symbol_value (symbol_p));
456455
prop_counter_p->symbol_named_props++;
457456
}
458-
#endif /* !JERRY_ESNEXT */
457+
#endif /* JERRY_ESNEXT */
459458
} /* ecma_op_arguments_object_list_lazy_property_names */
460459

461460
/**

‎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 *

0 commit comments

Comments
 (0)