YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

current_new_target -> current_new_target_p (#4478)

Browse Source 
JerryScript-DCO-1.0-Signed-off-by: Yonggang Luo luoyonggang@gmail.com
This commit is contained in:
Yonggang Luo
2021-01-17 05:53:25 -08:00
committed by GitHub
parent f2e9062cfc
commit 11894a6032
26 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/api/jerry.c
+13 -13
View File
@@ -2067,16 +2067,16 @@ jerry_create_promise (void)
jerry_assert_api_available ();
#if ENABLED (JERRY_BUILTIN_PROMISE)
ecma_object_t *old_new_target_p = JERRY_CONTEXT (current_new_target);
ecma_object_t *old_new_target_p = JERRY_CONTEXT (current_new_target_p);
if (old_new_target_p == NULL)
{
JERRY_CONTEXT (current_new_target) = ecma_builtin_get (ECMA_BUILTIN_ID_PROMISE);
JERRY_CONTEXT (current_new_target_p) = ecma_builtin_get (ECMA_BUILTIN_ID_PROMISE);
}
ecma_value_t promise_value = ecma_op_create_promise_object (ECMA_VALUE_EMPTY, ECMA_PROMISE_EXECUTOR_EMPTY);
JERRY_CONTEXT (current_new_target) = old_new_target_p;
JERRY_CONTEXT (current_new_target_p) = old_new_target_p;
return promise_value;
#else /* !ENABLED (JERRY_BUILTIN_PROMISE) */
return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("Promise not supported.")));
@@ -4622,15 +4622,15 @@ jerry_value_t
jerry_get_new_target (void)
{
#if ENABLED (JERRY_ESNEXT)
ecma_object_t *current_new_target = JERRY_CONTEXT (current_new_target);
ecma_object_t *current_new_target_p = JERRY_CONTEXT (current_new_target_p);
if (current_new_target == NULL)
if (current_new_target_p == NULL)
{
return jerry_create_undefined ();
}
ecma_ref_object (current_new_target);
return ecma_make_object_value (current_new_target);
ecma_ref_object (current_new_target_p);
return ecma_make_object_value (current_new_target_p);
#else /* !ENABLED (JERRY_ESNEXT) */
return jerry_create_undefined ();
#endif /* ENABLED (JERRY_ESNEXT) */
@@ -5091,14 +5091,14 @@ jerry_create_dataview (const jerry_value_t array_buffer, /**< arraybuffer to cre
ecma_make_uint32_value (byte_offset),
ecma_make_uint32_value (byte_length)
};
ecma_object_t *old_new_target_p = JERRY_CONTEXT (current_new_target);
ecma_object_t *old_new_target_p = JERRY_CONTEXT (current_new_target_p);
if (old_new_target_p == NULL)
{
JERRY_CONTEXT (current_new_target) = ecma_builtin_get (ECMA_BUILTIN_ID_DATAVIEW);
JERRY_CONTEXT (current_new_target_p) = ecma_builtin_get (ECMA_BUILTIN_ID_DATAVIEW);
}
ecma_value_t dataview_value = ecma_op_dataview_create (arguments_p, 3);
JERRY_CONTEXT (current_new_target) = old_new_target_p;
JERRY_CONTEXT (current_new_target_p) = old_new_target_p;
return jerry_return (dataview_value);
#else /* !ENABLED (JERRY_BUILTIN_DATAVIEW) */
JERRY_UNUSED (array_buffer);
@@ -5657,11 +5657,11 @@ jerry_create_container (jerry_container_type_t container_type, /**< Type of the
return jerry_throw (ecma_raise_type_error (ECMA_ERR_MSG ("Invalid container type.")));
}
}
ecma_object_t * old_new_target_p = JERRY_CONTEXT (current_new_target);
ecma_object_t * old_new_target_p = JERRY_CONTEXT (current_new_target_p);
if (old_new_target_p == NULL)
{
JERRY_CONTEXT (current_new_target) = ecma_builtin_get (ctor_id);
JERRY_CONTEXT (current_new_target_p) = ecma_builtin_get (ctor_id);
}
ecma_value_t container_value = ecma_op_container_create (arguments_list_p,
@@ -5669,7 +5669,7 @@ jerry_create_container (jerry_container_type_t container_type, /**< Type of the
lit_id,
proto_id);
JERRY_CONTEXT (current_new_target) = old_new_target_p;
JERRY_CONTEXT (current_new_target_p) = old_new_target_p;
return container_value;
#else /* !ENABLED (JERRY_BUILTIN_CONTAINER) */
JERRY_UNUSED (arguments_list_p);
jerry-core/ecma/base/ecma-init-finalize.c
+2 -2
View File
@@ -61,7 +61,7 @@ ecma_init (void)
#endif /* ENABLED (JERRY_BUILTIN_PROMISE) */
#if ENABLED (JERRY_ESNEXT)
JERRY_CONTEXT (current_new_target) = NULL;
JERRY_CONTEXT (current_new_target_p) = NULL;
#endif /* ENABLED (JERRY_ESNEXT) */
} /* ecma_init */
@@ -72,7 +72,7 @@ void
ecma_finalize (void)
{
#if ENABLED (JERRY_ESNEXT)
JERRY_ASSERT (JERRY_CONTEXT (current_new_target) == NULL);
JERRY_ASSERT (JERRY_CONTEXT (current_new_target_p) == NULL);
#endif /* ENABLED (JERRY_ESNEXT) */
ecma_finalize_global_environment ();
jerry-core/ecma/builtin-objects/ecma-builtin-array.c
+1 -1
View File
@@ -514,7 +514,7 @@ ecma_builtin_array_dispatch_construct (const ecma_value_t *arguments_list_p, /**
#if !ENABLED (JERRY_ESNEXT)
return ecma_builtin_array_dispatch_call (arguments_list_p, arguments_list_len);
#else /* ENABLED (JERRY_ESNEXT) */
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target),
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p),
ECMA_BUILTIN_ID_ARRAY_PROTOTYPE);
if (proto_p == NULL)
jerry-core/ecma/builtin-objects/ecma-builtin-date.c
+2 -2
View File
@@ -719,9 +719,9 @@ ecma_builtin_date_dispatch_construct (const ecma_value_t *arguments_list_p, /**<
uint32_t arguments_list_len) /**< number of arguments */
{
#if ENABLED (JERRY_ESNEXT)
JERRY_ASSERT (JERRY_CONTEXT (current_new_target));
JERRY_ASSERT (JERRY_CONTEXT (current_new_target_p));
ecma_object_t *prototype_obj_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target),
ecma_object_t *prototype_obj_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p),
ECMA_BUILTIN_ID_DATE_PROTOTYPE);
if (JERRY_UNLIKELY (prototype_obj_p == NULL))
{
jerry-core/ecma/builtin-objects/ecma-builtin-error.c
+1 -1
View File
@@ -67,7 +67,7 @@ ecma_builtin_error_dispatch_construct (const ecma_value_t *arguments_list_p, /**
#if !ENABLED (JERRY_ESNEXT)
return ecma_builtin_error_dispatch_call (arguments_list_p, arguments_list_len);
#else /* ENABLED (JERRY_ESNEXT) */
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target),
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p),
ECMA_BUILTIN_ID_ERROR_PROTOTYPE);
if (proto_p == NULL)
jerry-core/ecma/builtin-objects/ecma-builtin-evalerror.c
+1 -1
View File
@@ -69,7 +69,7 @@ ecma_builtin_eval_error_dispatch_construct (const ecma_value_t *arguments_list_p
#if !ENABLED (JERRY_ESNEXT)
return ecma_builtin_eval_error_dispatch_call (arguments_list_p, arguments_list_len);
#else /* ENABLED (JERRY_ESNEXT) */
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target),
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p),
ECMA_BUILTIN_ID_EVAL_ERROR_PROTOTYPE);
if (proto_p == NULL)
jerry-core/ecma/builtin-objects/ecma-builtin-object.c
+2 -2
View File
@@ -124,9 +124,9 @@ ecma_builtin_object_dispatch_construct (const ecma_value_t *arguments_list_p, /*
uint32_t arguments_list_len) /**< number of arguments */
{
#if ENABLED (JERRY_ESNEXT)
if (JERRY_CONTEXT (current_new_target) != ecma_builtin_get (ECMA_BUILTIN_ID_OBJECT))
if (JERRY_CONTEXT (current_new_target_p) != ecma_builtin_get (ECMA_BUILTIN_ID_OBJECT))
{
ecma_object_t *prototype_obj_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target),
ecma_object_t *prototype_obj_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p),
ECMA_BUILTIN_ID_OBJECT_PROTOTYPE);
if (JERRY_UNLIKELY (prototype_obj_p == NULL))
{
jerry-core/ecma/builtin-objects/ecma-builtin-rangeerror.c
+1 -1
View File
@@ -69,7 +69,7 @@ ecma_builtin_range_error_dispatch_construct (const ecma_value_t *arguments_list_
#if !ENABLED (JERRY_ESNEXT)
return ecma_builtin_range_error_dispatch_call (arguments_list_p, arguments_list_len);
#else /* ENABLED (JERRY_ESNEXT) */
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target),
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p),
ECMA_BUILTIN_ID_RANGE_ERROR_PROTOTYPE);
if (proto_p == NULL)
jerry-core/ecma/builtin-objects/ecma-builtin-referenceerror.c
+1 -1
View File
@@ -69,7 +69,7 @@ ecma_builtin_reference_error_dispatch_construct (const ecma_value_t *arguments_l
#if !ENABLED (JERRY_ESNEXT)
return ecma_builtin_reference_error_dispatch_call (arguments_list_p, arguments_list_len);
#else /* ENABLED (JERRY_ESNEXT) */
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target),
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p),
ECMA_BUILTIN_ID_REFERENCE_ERROR_PROTOTYPE);
if (proto_p == NULL)
jerry-core/ecma/builtin-objects/ecma-builtin-regexp.c
+1 -1
View File
@@ -51,7 +51,7 @@ ecma_builtin_regexp_dispatch_helper (const ecma_value_t *arguments_list_p, /**<
#if ENABLED (JERRY_ESNEXT)
bool create_regexp_from_bc = false;
bool free_arguments = false;
ecma_object_t *new_target_p = JERRY_CONTEXT (current_new_target);
ecma_object_t *new_target_p = JERRY_CONTEXT (current_new_target_p);
#else /* !ENABLED (JERRY_ESNEXT) */
ecma_object_t *new_target_p = NULL;
#endif /* ENABLED (JERRY_ESNEXT) */
jerry-core/ecma/builtin-objects/ecma-builtin-syntaxerror.c
+1 -1
View File
@@ -69,7 +69,7 @@ ecma_builtin_syntax_error_dispatch_construct (const ecma_value_t *arguments_list
#if !ENABLED (JERRY_ESNEXT)
return ecma_builtin_syntax_error_dispatch_call (arguments_list_p, arguments_list_len);
#else /* ENABLED (JERRY_ESNEXT) */
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target),
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p),
ECMA_BUILTIN_ID_SYNTAX_ERROR_PROTOTYPE);
if (proto_p == NULL)
jerry-core/ecma/builtin-objects/ecma-builtin-typeerror.c
+1 -1
View File
@@ -69,7 +69,7 @@ ecma_builtin_type_error_dispatch_construct (const ecma_value_t *arguments_list_p
#if !ENABLED (JERRY_ESNEXT)
return ecma_builtin_type_error_dispatch_call (arguments_list_p, arguments_list_len);
#else /* ENABLED (JERRY_ESNEXT) */
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target),
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p),
ECMA_BUILTIN_ID_TYPE_ERROR_PROTOTYPE);
if (proto_p == NULL)
jerry-core/ecma/builtin-objects/ecma-builtin-urierror.c
+1 -1
View File
@@ -69,7 +69,7 @@ ecma_builtin_uri_error_dispatch_construct (const ecma_value_t *arguments_list_p,
#if !ENABLED (JERRY_ESNEXT)
return ecma_builtin_uri_error_dispatch_call (arguments_list_p, arguments_list_len);
#else /* ENABLED (JERRY_ESNEXT) */
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target),
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p),
ECMA_BUILTIN_ID_URI_ERROR_PROTOTYPE);
if (proto_p == NULL)
jerry-core/ecma/builtin-objects/typedarray/ecma-builtin-typedarray-helpers.c
+3 -3
View File
@@ -42,9 +42,9 @@ ecma_typedarray_helper_dispatch_construct (const ecma_value_t *arguments_list_p,
ecma_builtin_id_t proto_id = ecma_typedarray_helper_get_prototype_id (typedarray_id);
ecma_object_t *prototype_obj_p = ecma_builtin_get (proto_id);
if (JERRY_CONTEXT (current_new_target))
if (JERRY_CONTEXT (current_new_target_p))
{
prototype_obj_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target), proto_id);
prototype_obj_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p), proto_id);
}
ecma_value_t val = ecma_op_create_typedarray (arguments_list_p,
@@ -53,7 +53,7 @@ ecma_typedarray_helper_dispatch_construct (const ecma_value_t *arguments_list_p,
ecma_typedarray_helper_get_shift_size (typedarray_id),
typedarray_id);
if (JERRY_CONTEXT (current_new_target))
if (JERRY_CONTEXT (current_new_target_p))
{
ecma_deref_object (prototype_obj_p);
}
jerry-core/ecma/operations/ecma-arraybuffer-object.c
+1 -1
View File
@@ -143,7 +143,7 @@ ecma_op_create_arraybuffer_object (const ecma_value_t *arguments_list_p, /**< li
uint32_t length_uint32 = ecma_number_to_uint32 (length_num);
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target),
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p),
ECMA_BUILTIN_ID_ARRAYBUFFER_PROTOTYPE);
if (proto_p == NULL)
jerry-core/ecma/operations/ecma-async-generator-object.c
+3 -3
View File
@@ -55,10 +55,10 @@ ecma_async_generator_enqueue (vm_executable_object_t *async_generator_object_p,
task_p->operation_value = ecma_copy_value_if_not_object (value);
task_p->operation_type = (uint8_t) operation;
ecma_object_t *old_new_target_p = JERRY_CONTEXT (current_new_target);
JERRY_CONTEXT (current_new_target) = ecma_builtin_get (ECMA_BUILTIN_ID_PROMISE);
ecma_object_t *old_new_target_p = JERRY_CONTEXT (current_new_target_p);
JERRY_CONTEXT (current_new_target_p) = ecma_builtin_get (ECMA_BUILTIN_ID_PROMISE);
ecma_value_t result = ecma_op_create_promise_object (ECMA_VALUE_EMPTY, ECMA_PROMISE_EXECUTOR_EMPTY);
JERRY_CONTEXT (current_new_target) = old_new_target_p;
JERRY_CONTEXT (current_new_target_p) = old_new_target_p;
task_p->promise = result;
ecma_value_t head = async_generator_object_p->extended_object.u.class_prop.u.head;
jerry-core/ecma/operations/ecma-boolean-object.c
+1 -1
View File
@@ -55,7 +55,7 @@ ecma_op_create_boolean_object (ecma_value_t arg) /**< argument passed to the Boo
ecma_object_t *prototype_obj_p = ecma_builtin_get (proto_id);
#if ENABLED (JERRY_ESNEXT)
ecma_object_t *new_target = JERRY_CONTEXT (current_new_target);
ecma_object_t *new_target = JERRY_CONTEXT (current_new_target_p);
if (new_target)
{
prototype_obj_p = ecma_op_get_prototype_from_constructor (new_target, proto_id);
jerry-core/ecma/operations/ecma-container-object.c
+2 -2
View File
@@ -373,9 +373,9 @@ ecma_op_container_create (const ecma_value_t *arguments_list_p, /**< arguments l
|| lit_id == LIT_MAGIC_STRING_SET_UL
|| lit_id == LIT_MAGIC_STRING_WEAKMAP_UL
|| lit_id == LIT_MAGIC_STRING_WEAKSET_UL);
JERRY_ASSERT (JERRY_CONTEXT (current_new_target) != NULL);
JERRY_ASSERT (JERRY_CONTEXT (current_new_target_p) != NULL);
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target), proto_id);
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p), proto_id);
if (JERRY_UNLIKELY (proto_p == NULL))
{
jerry-core/ecma/operations/ecma-dataview-object.c
+2 -2
View File
@@ -48,7 +48,7 @@ ecma_op_dataview_create (const ecma_value_t *arguments_list_p, /**< arguments li
uint32_t arguments_list_len) /**< number of arguments */
{
JERRY_ASSERT (arguments_list_len == 0 || arguments_list_p != NULL);
JERRY_ASSERT (JERRY_CONTEXT (current_new_target));
JERRY_ASSERT (JERRY_CONTEXT (current_new_target_p));
ecma_value_t buffer = arguments_list_len > 0 ? arguments_list_p[0] : ECMA_VALUE_UNDEFINED;
@@ -121,7 +121,7 @@ ecma_op_dataview_create (const ecma_value_t *arguments_list_p, /**< arguments li
}
/* 9. */
ecma_object_t *prototype_obj_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target),
ecma_object_t *prototype_obj_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p),
ECMA_BUILTIN_ID_DATAVIEW_PROTOTYPE);
if (JERRY_UNLIKELY (prototype_obj_p == NULL))
{
jerry-core/ecma/operations/ecma-function-object.c
+18 -18
View File
@@ -491,7 +491,7 @@ ecma_op_create_dynamic_function (const ecma_value_t *arguments_list_p, /**< argu
ecma_builtin_id_t fallback_proto = ECMA_BUILTIN_ID_FUNCTION_PROTOTYPE;
#if ENABLED (JERRY_ESNEXT)
ecma_object_t *new_target_p = JERRY_CONTEXT (current_new_target);
ecma_object_t *new_target_p = JERRY_CONTEXT (current_new_target_p);
if (JERRY_UNLIKELY (parse_opts & (ECMA_PARSE_GENERATOR_FUNCTION | ECMA_PARSE_ASYNC_FUNCTION)))
{
@@ -649,9 +649,9 @@ ecma_op_create_arrow_function_object (ecma_object_t *scope_p, /**< function's sc
arrow_func_p->this_binding = ecma_copy_value_if_not_object (this_binding);
arrow_func_p->new_target = ECMA_VALUE_UNDEFINED;
if (JERRY_CONTEXT (current_new_target) != NULL)
if (JERRY_CONTEXT (current_new_target_p) != NULL)
{
arrow_func_p->new_target = ecma_make_object_value (JERRY_CONTEXT (current_new_target));
arrow_func_p->new_target = ecma_make_object_value (JERRY_CONTEXT (current_new_target_p));
}
return func_p;
} /* ecma_op_create_arrow_function_object */
@@ -1071,11 +1071,11 @@ ecma_op_function_call_simple (ecma_object_t *func_obj_p, /**< Function object */
if (ecma_is_value_undefined (arrow_func_p->new_target))
{
JERRY_CONTEXT (current_new_target) = NULL;
JERRY_CONTEXT (current_new_target_p) = NULL;
}
else
{
JERRY_CONTEXT (current_new_target) = ecma_get_object_from_value (arrow_func_p->new_target);
JERRY_CONTEXT (current_new_target_p) = ecma_get_object_from_value (arrow_func_p->new_target);
}
this_binding = arrow_func_p->this_binding;
}
@@ -1121,7 +1121,7 @@ ecma_op_function_call_simple (ecma_object_t *func_obj_p, /**< Function object */
#if ENABLED (JERRY_ESNEXT)
if (JERRY_UNLIKELY (CBC_FUNCTION_GET_TYPE (status_flags) == CBC_FUNCTION_CONSTRUCTOR))
{
if (JERRY_CONTEXT (current_new_target) == NULL)
if (JERRY_CONTEXT (current_new_target_p) == NULL)
{
ret_value = ecma_raise_type_error (ECMA_ERR_MSG ("Class constructor cannot be invoked without 'new'."));
goto exit;
@@ -1363,10 +1363,10 @@ ecma_op_function_call (ecma_object_t *func_obj_p, /**< Function object */
#endif /* ENABLED (JERRY_BUILTIN_PROXY) */
#if ENABLED (JERRY_ESNEXT)
ecma_object_t *old_new_target_p = JERRY_CONTEXT (current_new_target);
ecma_object_t *old_new_target_p = JERRY_CONTEXT (current_new_target_p);
if (JERRY_UNLIKELY (!(JERRY_CONTEXT (status_flags) & ECMA_STATUS_DIRECT_EVAL)))
{
JERRY_CONTEXT (current_new_target) = NULL;
JERRY_CONTEXT (current_new_target_p) = NULL;
}
#endif /* ENABLED (JERRY_ESNEXT) */
@@ -1386,7 +1386,7 @@ ecma_op_function_call (ecma_object_t *func_obj_p, /**< Function object */
}
#if ENABLED (JERRY_ESNEXT)
JERRY_CONTEXT (current_new_target) = old_new_target_p;
JERRY_CONTEXT (current_new_target_p) = old_new_target_p;
#endif /* ENABLED (JERRY_ESNEXT) */
return result;
@@ -1454,14 +1454,14 @@ ecma_op_function_construct_native (ecma_object_t *func_obj_p, /**< Function obje
ecma_deref_object (proto_p);
#if ENABLED (JERRY_ESNEXT)
ecma_object_t *old_new_target_p = JERRY_CONTEXT (current_new_target);
JERRY_CONTEXT (current_new_target) = new_target_p;
ecma_object_t *old_new_target_p = JERRY_CONTEXT (current_new_target_p);
JERRY_CONTEXT (current_new_target_p) = new_target_p;
#endif /* ENABLED (JERRY_ESNEXT) */
ecma_value_t ret_value = ecma_op_function_call_native (func_obj_p, this_arg, arguments_list_p, arguments_list_len);
#if ENABLED (JERRY_ESNEXT)
JERRY_CONTEXT (current_new_target) = old_new_target_p;
JERRY_CONTEXT (current_new_target_p) = old_new_target_p;
#endif /* ENABLED (JERRY_ESNEXT) */
if (ECMA_IS_VALUE_ERROR (ret_value) || ecma_is_value_object (ret_value))
@@ -1520,14 +1520,14 @@ ecma_op_function_construct (ecma_object_t *func_obj_p, /**< Function object */
#endif /* ENABLED (JERRY_BUILTIN_REALMS) */
#if ENABLED (JERRY_ESNEXT)
ecma_object_t *old_new_target = JERRY_CONTEXT (current_new_target);
JERRY_CONTEXT (current_new_target) = new_target_p;
ecma_object_t *old_new_target = JERRY_CONTEXT (current_new_target_p);
JERRY_CONTEXT (current_new_target_p) = new_target_p;
#endif /* ENABLED (JERRY_ESNEXT) */
ecma_value_t ret_value = ecma_builtin_dispatch_construct (func_obj_p, arguments_list_p, arguments_list_len);
#if ENABLED (JERRY_ESNEXT)
JERRY_CONTEXT (current_new_target) = old_new_target;
JERRY_CONTEXT (current_new_target_p) = old_new_target;
#endif /* ENABLED (JERRY_ESNEXT) */
#if ENABLED (JERRY_BUILTIN_REALMS)
@@ -1572,14 +1572,14 @@ ecma_op_function_construct (ecma_object_t *func_obj_p, /**< Function object */
}
/* 6. */
ecma_object_t *old_new_target_p = JERRY_CONTEXT (current_new_target);
JERRY_CONTEXT (current_new_target) = new_target_p;
ecma_object_t *old_new_target_p = JERRY_CONTEXT (current_new_target_p);
JERRY_CONTEXT (current_new_target_p) = new_target_p;
#endif /* ENABLED (JERRY_ESNEXT) */
ecma_value_t ret_value = ecma_op_function_call_simple (func_obj_p, this_arg, arguments_list_p, arguments_list_len);
#if ENABLED (JERRY_ESNEXT)
JERRY_CONTEXT (current_new_target) = old_new_target_p;
JERRY_CONTEXT (current_new_target_p) = old_new_target_p;
#endif /* ENABLED (JERRY_ESNEXT) */
/* 13.a */
jerry-core/ecma/operations/ecma-number-object.c
+1 -1
View File
@@ -60,7 +60,7 @@ ecma_op_create_number_object (ecma_value_t arg) /**< argument passed to the Numb
#endif /* ENABLED (JERRY_BUILTIN_NUMBER) */
ecma_object_t *prototype_obj_p = ecma_builtin_get (proto_id);
#if ENABLED (JERRY_ESNEXT)
ecma_object_t *new_target = JERRY_CONTEXT (current_new_target);
ecma_object_t *new_target = JERRY_CONTEXT (current_new_target_p);
if (new_target)
{
prototype_obj_p = ecma_op_get_prototype_from_constructor (new_target, proto_id);
jerry-core/ecma/operations/ecma-promise-object.c
+2 -2
View File
@@ -390,9 +390,9 @@ ecma_value_t
ecma_op_create_promise_object (ecma_value_t executor, /**< the executor function or object */
ecma_promise_executor_type_t type) /**< indicates the type of executor */
{
JERRY_ASSERT (JERRY_CONTEXT (current_new_target) != NULL);
JERRY_ASSERT (JERRY_CONTEXT (current_new_target_p) != NULL);
/* 3. */
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target),
ecma_object_t *proto_p = ecma_op_get_prototype_from_constructor (JERRY_CONTEXT (current_new_target_p),
ECMA_BUILTIN_ID_PROMISE_PROTOTYPE);
if (JERRY_UNLIKELY (proto_p == NULL))
jerry-core/ecma/operations/ecma-string-object.c
+1 -1
View File
@@ -70,7 +70,7 @@ ecma_op_create_string_object (const ecma_value_t *arguments_list_p, /**< list of
#endif /* ENABLED (JERRY_BUILTIN_STRING) */
ecma_object_t *prototype_obj_p = ecma_builtin_get (proto_id);
#if ENABLED (JERRY_ESNEXT)
ecma_object_t *new_target = JERRY_CONTEXT (current_new_target);
ecma_object_t *new_target = JERRY_CONTEXT (current_new_target_p);
if (new_target)
{
prototype_obj_p = ecma_op_get_prototype_from_constructor (new_target, proto_id);
jerry-core/jcontext/jcontext.h
+1 -1
View File
@@ -228,7 +228,7 @@ struct jerry_context_t
* * NULL (0x0): the current "new.target" is undefined, that is the execution is inside a normal method.
* * Any other valid function object pointer: the current "new.target" is valid and it is constructor call.
*/
ecma_object_t *current_new_target;
ecma_object_t *current_new_target_p;
#endif /* ENABLED (JERRY_ESNEXT) */
};
jerry-core/vm/opcodes.c
+9 -9
View File
@@ -848,8 +848,8 @@ opfunc_resume_executable_object (vm_executable_object_t *executable_object_p, /*
JERRY_CONTEXT (vm_top_context_p) = &executable_object_p->frame_ctx;
/* inside the generators the "new.target" is always "undefined" as it can't be invoked with "new" */
ecma_object_t *old_new_target = JERRY_CONTEXT (current_new_target);
JERRY_CONTEXT (current_new_target) = NULL;
ecma_object_t *old_new_target = JERRY_CONTEXT (current_new_target_p);
JERRY_CONTEXT (current_new_target_p) = NULL;
#if ENABLED (JERRY_BUILTIN_REALMS)
ecma_global_object_t *saved_global_object_p = JERRY_CONTEXT (global_object_p);
@@ -862,7 +862,7 @@ opfunc_resume_executable_object (vm_executable_object_t *executable_object_p, /*
JERRY_CONTEXT (global_object_p) = saved_global_object_p;
#endif /* ENABLED (JERRY_BUILTIN_REALMS) */
JERRY_CONTEXT (current_new_target) = old_new_target;
JERRY_CONTEXT (current_new_target_p) = old_new_target;
executable_object_p->extended_object.u.class_prop.extra_info &= (uint16_t) ~ECMA_EXECUTABLE_OBJECT_RUNNING;
if (executable_object_p->frame_ctx.call_operation != VM_EXEC_RETURN)
@@ -970,15 +970,15 @@ opfunc_async_create_and_await (vm_frame_ctx_t *frame_ctx_p, /**< frame context *
ecma_deref_object ((ecma_object_t *) executable_object_p);
ecma_free_value (result);
ecma_object_t *old_new_target_p = JERRY_CONTEXT (current_new_target);
JERRY_CONTEXT (current_new_target) = promise_p;
ecma_object_t *old_new_target_p = JERRY_CONTEXT (current_new_target_p);
JERRY_CONTEXT (current_new_target_p) = promise_p;
result = ecma_op_create_promise_object (ECMA_VALUE_EMPTY, ECMA_PROMISE_EXECUTOR_EMPTY);
JERRY_ASSERT (ecma_is_value_object (result));
executable_object_p->frame_ctx.block_result = result;
JERRY_CONTEXT (current_new_target) = old_new_target_p;
JERRY_CONTEXT (current_new_target_p) = old_new_target_p;
return result;
} /* opfunc_async_create_and_await */
@@ -1138,7 +1138,7 @@ ecma_op_implicit_constructor_handler_cb (const ecma_value_t function_obj, /**< t
{
JERRY_UNUSED_2 (args_p, args_count);
if (JERRY_CONTEXT (current_new_target) == NULL)
if (JERRY_CONTEXT (current_new_target_p) == NULL)
{
return ecma_raise_type_error (ECMA_ERR_MSG ("Class constructor cannot be invoked without 'new'."));
}
@@ -1162,7 +1162,7 @@ ecma_op_implicit_constructor_handler_heritage_cb (const ecma_value_t function_ob
{
JERRY_UNUSED (this_val);
if (JERRY_CONTEXT (current_new_target) == NULL)
if (JERRY_CONTEXT (current_new_target_p) == NULL)
{
return ecma_raise_type_error (ECMA_ERR_MSG ("Class constructor cannot be invoked without 'new'."));
}
@@ -1178,7 +1178,7 @@ ecma_op_implicit_constructor_handler_heritage_cb (const ecma_value_t function_ob
ecma_object_t *super_ctor_p = ecma_get_object_from_value (super_ctor);
ecma_value_t result = ecma_op_function_construct (super_ctor_p,
JERRY_CONTEXT (current_new_target),
JERRY_CONTEXT (current_new_target_p),
args_p,
args_count);
jerry-core/vm/vm.c
+5 -5
View File
@@ -602,7 +602,7 @@ vm_super_call (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
{
ecma_object_t *func_obj_p = ecma_get_object_from_value (func_value);
completion_value = ecma_op_function_construct (func_obj_p,
JERRY_CONTEXT (current_new_target),
JERRY_CONTEXT (current_new_target_p),
arguments_p,
arguments_list_len);
@@ -2626,12 +2626,12 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
if (result == ECMA_VALUE_UNDEFINED)
{
ecma_object_t *old_new_target_p = JERRY_CONTEXT (current_new_target);
JERRY_CONTEXT (current_new_target) = ecma_builtin_get (ECMA_BUILTIN_ID_PROMISE);
ecma_object_t *old_new_target_p = JERRY_CONTEXT (current_new_target_p);
JERRY_CONTEXT (current_new_target_p) = ecma_builtin_get (ECMA_BUILTIN_ID_PROMISE);
result = ecma_op_create_promise_object (ECMA_VALUE_EMPTY, ECMA_PROMISE_EXECUTOR_EMPTY);
JERRY_CONTEXT (current_new_target) = old_new_target_p;
JERRY_CONTEXT (current_new_target_p) = old_new_target_p;
}
vm_stack_context_type_t context_type = VM_GET_CONTEXT_TYPE (stack_top_p[-1]);
@@ -2698,7 +2698,7 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
}
case VM_OC_PUSH_NEW_TARGET:
{
ecma_object_t *new_target_object = JERRY_CONTEXT (current_new_target);
ecma_object_t *new_target_object = JERRY_CONTEXT (current_new_target_p);
if (new_target_object == NULL)
{
*stack_top_p++ = ECMA_VALUE_UNDEFINED;