Skip to content

Commit

Permalink
Fix the private field crash for the Array object.
Browse files Browse the repository at this point in the history
JerryScript-DCO-1.0-Signed-off-by: Baihe Jiang <baihe.jiang@outlook.com>
  • Loading branch information
paintedveil5 committed May 8, 2024
1 parent 47bd5d4 commit 411a949
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 0 deletions.
10 changes: 10 additions & 0 deletions jerry-core/vm/opcodes.c
Original file line number Diff line number Diff line change
Expand Up @@ -916,6 +916,11 @@ opfunc_private_method_or_accessor_add (ecma_object_t *class_object_p, /**< the f

JERRY_ASSERT (prop_name_p->u.hash & ECMA_SYMBOL_FLAG_PRIVATE_INSTANCE_METHOD);

if (ecma_op_object_is_fast_array (this_obj_p))
{
ecma_fast_array_convert_to_normal (this_obj_p);
}

prop_p = ecma_find_named_property (this_obj_p, prop_name_p);
ecma_object_t *method_p = ecma_get_object_from_value (method);

Expand Down Expand Up @@ -1366,6 +1371,11 @@ opfunc_private_field_add (ecma_value_t base, /**< base object */
ecma_string_t *prop_name_p = ecma_get_string_from_value (property);
ecma_string_t *private_key_p = NULL;

if (ecma_op_object_is_fast_array (obj_p))
{
ecma_fast_array_convert_to_normal (obj_p);
}

ecma_property_t *prop_p = opfunc_find_private_element (obj_p, prop_name_p, &private_key_p, false);

if (prop_p != NULL)
Expand Down
23 changes: 23 additions & 0 deletions tests/jerry/private_fields.js
Original file line number Diff line number Diff line change
Expand Up @@ -327,3 +327,26 @@ class O {
var var16 = new O();
var16.b();
assert(var16.c() == 12);

// Private fields are accessible in Array object
class P extends Array {
#a = 1;
b() {
return this.#a;
}
}

var var17 = new P();
assert(var17.b() == 1);

class Q extends Array {
#a() {
return 1;
}
b() {
return this.#a();
}
}

var var18 = new Q();
assert(var18.b() == 1);

0 comments on commit 411a949

Please sign in to comment.