From d4fe48fae44dda77e3092fa4ed54de120ec23983 Mon Sep 17 00:00:00 2001 From: Robert Fancsik Date: Thu, 28 May 2020 14:15:33 +0200 Subject: [PATCH] Script classes should be skipped during 'name' property lazy instantiation (#3809) This patch fixes the TC262 language/expressions/class/name.js testcase. JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik frobert@inf.u-szeged.hu --- .../ecma/operations/ecma-function-object.c | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/jerry-core/ecma/operations/ecma-function-object.c b/jerry-core/ecma/operations/ecma-function-object.c index 6f5e3884b..bb817697a 100644 --- a/jerry-core/ecma/operations/ecma-function-object.c +++ b/jerry-core/ecma/operations/ecma-function-object.c @@ -1474,19 +1474,22 @@ ecma_op_function_try_to_lazy_instantiate_property (ecma_object_t *object_p, /**< ECMA_SET_SECOND_BIT_TO_POINTER_TAG (ext_func_p->u.function.scope_cp); const ecma_compiled_code_t *bytecode_data_p = ecma_op_function_get_compiled_code (ext_func_p); - ecma_value_t value = *ecma_compiled_code_resolve_function_name (bytecode_data_p); - if (value != ECMA_VALUE_EMPTY) + if (!(bytecode_data_p->status_flags & CBC_CODE_FLAGS_CLASS_CONSTRUCTOR)) { - JERRY_ASSERT (ecma_is_value_string (value)); + ecma_value_t value = *ecma_compiled_code_resolve_function_name (bytecode_data_p); + if (value != ECMA_VALUE_EMPTY) + { + JERRY_ASSERT (ecma_is_value_string (value)); - /* Initialize 'name' property */ - ecma_property_t *value_prop_p; - ecma_property_value_t *value_p = ecma_create_named_data_property (object_p, - property_name_p, - ECMA_PROPERTY_FLAG_CONFIGURABLE, - &value_prop_p); - value_p->value = ecma_copy_value (value); - return value_prop_p; + /* Initialize 'name' property */ + ecma_property_t *value_prop_p; + ecma_property_value_t *value_p = ecma_create_named_data_property (object_p, + property_name_p, + ECMA_PROPERTY_FLAG_CONFIGURABLE, + &value_prop_p); + value_p->value = ecma_copy_value (value); + return value_prop_p; + } } }