Introduce jerry_port_track_promise_rejection (#4451)
This patch resolves #2931. JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik frobert@inf.u-szeged.hu
This commit is contained in:
@@ -151,6 +151,32 @@ jerry_port_get_native_module (jerry_value_t name) /**< module specifier */
|
|||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## Promise
|
||||||
|
|
||||||
|
```c
|
||||||
|
/**
|
||||||
|
* HostPromiseRejectionTracker operations
|
||||||
|
*/
|
||||||
|
typedef enum
|
||||||
|
{
|
||||||
|
JERRY_PROMISE_REJECTION_OPERATION_REJECT, /**< promise is rejected without any handlers */
|
||||||
|
JERRY_PROMISE_REJECTION_OPERATION_HANDLE, /**< handler is added to a rejected promise for the first time */
|
||||||
|
} jerry_promise_rejection_operation_t;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Track unhandled promise rejections.
|
||||||
|
*
|
||||||
|
* Note:
|
||||||
|
* This port function is called by jerry-core when JERRY_BUILTIN_PROMISE
|
||||||
|
* is enabled.
|
||||||
|
*
|
||||||
|
* @param promise rejected promise
|
||||||
|
* @param operation HostPromiseRejectionTracker operation
|
||||||
|
*/
|
||||||
|
void jerry_port_track_promise_rejection (const jerry_value_t promise,
|
||||||
|
const jerry_promise_rejection_operation_t operation);
|
||||||
|
```
|
||||||
|
|
||||||
## Date
|
## Date
|
||||||
|
|
||||||
```c
|
```c
|
||||||
@@ -392,3 +418,32 @@ void jerry_port_sleep (uint32_t sleep_time)
|
|||||||
} /* jerry_port_sleep */
|
} /* jerry_port_sleep */
|
||||||
#endif /* defined (JERRY_DEBUGGER) && (JERRY_DEBUGGER == 1) */
|
#endif /* defined (JERRY_DEBUGGER) && (JERRY_DEBUGGER == 1) */
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## Promise
|
||||||
|
|
||||||
|
```c
|
||||||
|
#include "jerryscript-port.h"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Default implementation of jerry_port_track_promise_rejection.
|
||||||
|
* Prints the reason of the unhandled rejections.
|
||||||
|
*/
|
||||||
|
void
|
||||||
|
jerry_port_track_promise_rejection (const jerry_value_t promise, /**< rejected promise */
|
||||||
|
const jerry_promise_rejection_operation_t operation) /**< operation */
|
||||||
|
{
|
||||||
|
(void) operation; /* unused */
|
||||||
|
|
||||||
|
jerry_value_t reason = jerry_get_promise_result (promise);
|
||||||
|
jerry_value_t reason_to_string = jerry_value_to_string (reason);
|
||||||
|
jerry_size_t req_sz = jerry_get_utf8_string_size (reason_to_string);
|
||||||
|
jerry_char_t str_buf_p[req_sz + 1];
|
||||||
|
jerry_string_to_utf8_char_buffer (reason_to_string, str_buf_p, req_sz);
|
||||||
|
str_buf_p[req_sz] = '\0';
|
||||||
|
|
||||||
|
jerry_release_value (reason_to_string);
|
||||||
|
jerry_release_value (reason);
|
||||||
|
|
||||||
|
printf ("Uncaught (in promise) %s\n", str_buf_p);
|
||||||
|
} /* jerry_port_track_promise_rejection */
|
||||||
|
```
|
||||||
|
|||||||
@@ -181,6 +181,23 @@ ecma_is_resolver_already_called (ecma_object_t *promise_obj_p) /**< promise */
|
|||||||
return (ecma_promise_get_flags (promise_obj_p) & ECMA_PROMISE_ALREADY_RESOLVED) != 0;
|
return (ecma_promise_get_flags (promise_obj_p) & ECMA_PROMISE_ALREADY_RESOLVED) != 0;
|
||||||
} /* ecma_is_resolver_already_called */
|
} /* ecma_is_resolver_already_called */
|
||||||
|
|
||||||
|
/**
|
||||||
|
* HostPromiseRejectionTracker
|
||||||
|
*
|
||||||
|
* See also: ES11 25.6.1.9
|
||||||
|
*/
|
||||||
|
static void
|
||||||
|
ecma_track_promise_rejection (ecma_object_t *obj_p, /**< rejected promise */
|
||||||
|
jerry_promise_rejection_operation_t operation) /**< operation */
|
||||||
|
{
|
||||||
|
JERRY_ASSERT (ecma_is_promise (obj_p));
|
||||||
|
|
||||||
|
if (!(ecma_promise_get_flags (obj_p) & ECMA_PROMISE_HANDLED))
|
||||||
|
{
|
||||||
|
jerry_port_track_promise_rejection (ecma_make_object_value (obj_p), operation);
|
||||||
|
}
|
||||||
|
} /* ecma_track_promise_rejection */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reject a Promise with a reason.
|
* Reject a Promise with a reason.
|
||||||
*
|
*
|
||||||
@@ -208,6 +225,7 @@ ecma_reject_promise (ecma_value_t promise, /**< promise */
|
|||||||
promise_p->reactions = ecma_new_collection ();
|
promise_p->reactions = ecma_new_collection ();
|
||||||
|
|
||||||
ecma_collection_destroy (reactions);
|
ecma_collection_destroy (reactions);
|
||||||
|
ecma_track_promise_rejection (obj_p, JERRY_PROMISE_REJECTION_OPERATION_REJECT);
|
||||||
} /* ecma_reject_promise */
|
} /* ecma_reject_promise */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -818,10 +836,14 @@ ecma_promise_do_then (ecma_value_t promise, /**< the promise which call 'then' *
|
|||||||
{
|
{
|
||||||
/* 9. */
|
/* 9. */
|
||||||
ecma_value_t reason = ecma_promise_get_result (promise_obj_p);
|
ecma_value_t reason = ecma_promise_get_result (promise_obj_p);
|
||||||
|
ecma_track_promise_rejection (promise_obj_p, JERRY_PROMISE_REJECTION_OPERATION_HANDLE);
|
||||||
ecma_enqueue_promise_reaction_job (ecma_make_object_value (result_capability_obj_p), on_rejected, reason);
|
ecma_enqueue_promise_reaction_job (ecma_make_object_value (result_capability_obj_p), on_rejected, reason);
|
||||||
ecma_free_value (reason);
|
ecma_free_value (reason);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* ES11: 11. */
|
||||||
|
promise_p->header.u.class_prop.extra_info |= ECMA_PROMISE_HANDLED;
|
||||||
|
|
||||||
/* 10. */
|
/* 10. */
|
||||||
return ecma_copy_value (capability_p->header.u.class_prop.u.promise);
|
return ecma_copy_value (capability_p->header.u.class_prop.u.promise);
|
||||||
} /* ecma_promise_do_then */
|
} /* ecma_promise_do_then */
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ typedef enum
|
|||||||
ECMA_PROMISE_IS_PENDING = (1 << 0), /**< pending state */
|
ECMA_PROMISE_IS_PENDING = (1 << 0), /**< pending state */
|
||||||
ECMA_PROMISE_IS_FULFILLED = (1 << 1), /**< fulfilled state */
|
ECMA_PROMISE_IS_FULFILLED = (1 << 1), /**< fulfilled state */
|
||||||
ECMA_PROMISE_ALREADY_RESOLVED = (1 << 2), /**< already resolved */
|
ECMA_PROMISE_ALREADY_RESOLVED = (1 << 2), /**< already resolved */
|
||||||
|
ECMA_PROMISE_HANDLED = (1 << 3), /**< ES11: 25.6.6 [[PromiseIsHandled]] internal slot */
|
||||||
} ecma_promise_flags_t;
|
} ecma_promise_flags_t;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -252,6 +252,28 @@ size_t jerry_port_normalize_path (const char *in_path_p,
|
|||||||
*/
|
*/
|
||||||
jerry_value_t jerry_port_get_native_module (jerry_value_t name);
|
jerry_value_t jerry_port_get_native_module (jerry_value_t name);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* HostPromiseRejectionTracker operations
|
||||||
|
*/
|
||||||
|
typedef enum
|
||||||
|
{
|
||||||
|
JERRY_PROMISE_REJECTION_OPERATION_REJECT, /**< promise is rejected without any handlers */
|
||||||
|
JERRY_PROMISE_REJECTION_OPERATION_HANDLE, /**< handler is added to a rejected promise for the first time */
|
||||||
|
} jerry_promise_rejection_operation_t;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Track unhandled promise rejections.
|
||||||
|
*
|
||||||
|
* Note:
|
||||||
|
* This port function is called by jerry-core when JERRY_BUILTIN_PROMISE
|
||||||
|
* is enabled.
|
||||||
|
*
|
||||||
|
* @param promise rejected promise
|
||||||
|
* @param operation HostPromiseRejectionTracker operation
|
||||||
|
*/
|
||||||
|
void jerry_port_track_promise_rejection (const jerry_value_t promise,
|
||||||
|
const jerry_promise_rejection_operation_t operation);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @}
|
* @}
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ set(SOURCE_PORT_DEFAULT
|
|||||||
default-fatal.c
|
default-fatal.c
|
||||||
default-io.c
|
default-io.c
|
||||||
default-module.c
|
default-module.c
|
||||||
|
default-promise.c
|
||||||
)
|
)
|
||||||
|
|
||||||
# Amalgamated JerryScript source/header build.
|
# Amalgamated JerryScript source/header build.
|
||||||
|
|||||||
@@ -0,0 +1,39 @@
|
|||||||
|
/* Copyright JS Foundation and other contributors, http://js.foundation
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "jerryscript-port.h"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Default implementation of jerry_port_track_promise_rejection.
|
||||||
|
* Prints the reason of the unhandled rejections.
|
||||||
|
*/
|
||||||
|
void
|
||||||
|
jerry_port_track_promise_rejection (const jerry_value_t promise, /**< rejected promise */
|
||||||
|
const jerry_promise_rejection_operation_t operation) /**< operation */
|
||||||
|
{
|
||||||
|
(void) operation; /* unused */
|
||||||
|
|
||||||
|
jerry_value_t reason = jerry_get_promise_result (promise);
|
||||||
|
jerry_value_t reason_to_string = jerry_value_to_string (reason);
|
||||||
|
jerry_size_t req_sz = jerry_get_utf8_string_size (reason_to_string);
|
||||||
|
JERRY_VLA (jerry_char_t, str_buf_p, req_sz + 1);
|
||||||
|
jerry_string_to_utf8_char_buffer (reason_to_string, str_buf_p, req_sz);
|
||||||
|
str_buf_p[req_sz] = '\0';
|
||||||
|
|
||||||
|
jerry_release_value (reason_to_string);
|
||||||
|
jerry_release_value (reason);
|
||||||
|
|
||||||
|
jerry_port_log (JERRY_LOG_LEVEL_WARNING, "Uncaught (in promise) %s\n", str_buf_p);
|
||||||
|
} /* jerry_port_track_promise_rejection */
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
/* Copyright JS Foundation and other contributors, http://js.foundation
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "jerryscript-port.h"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Track unhandled promise rejections.
|
||||||
|
*
|
||||||
|
* Note:
|
||||||
|
* This port function is called by jerry-core when JERRY_BUILTIN_PROMISE
|
||||||
|
* is enabled.
|
||||||
|
*
|
||||||
|
* @param promise rejected promise
|
||||||
|
* @param operation HostPromiseRejectionTracker operation
|
||||||
|
*/
|
||||||
|
void
|
||||||
|
jerry_port_track_promise_rejection (const jerry_value_t promise,
|
||||||
|
const jerry_promise_rejection_operation_t operation)
|
||||||
|
{
|
||||||
|
(void) operation; /* unused */
|
||||||
|
|
||||||
|
jerry_value_t reason = jerry_get_promise_result (promise);
|
||||||
|
jerry_value_t reason_to_string = jerry_value_to_string (reason);
|
||||||
|
jerry_size_t req_sz = jerry_get_utf8_string_size (reason_to_string);
|
||||||
|
jerry_char_t str_buf_p[req_sz + 1];
|
||||||
|
jerry_string_to_utf8_char_buffer (reason_to_string, str_buf_p, req_sz);
|
||||||
|
str_buf_p[req_sz] = '\0';
|
||||||
|
|
||||||
|
jerry_release_value (reason_to_string);
|
||||||
|
jerry_release_value (reason);
|
||||||
|
|
||||||
|
jerry_port_log (JERRY_LOG_LEVEL_WARNING, "Uncaught (in promise) %s\n", str_buf_p);
|
||||||
|
} /* jerry_port_track_promise_rejection */
|
||||||
@@ -227,3 +227,32 @@ jerry_port_get_current_context (void)
|
|||||||
{
|
{
|
||||||
return current_context_p;
|
return current_context_p;
|
||||||
} /* jerry_port_get_current_context */
|
} /* jerry_port_get_current_context */
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Track unhandled promise rejections.
|
||||||
|
*
|
||||||
|
* Note:
|
||||||
|
* This port function is called by jerry-core when JERRY_BUILTIN_PROMISE
|
||||||
|
* is enabled.
|
||||||
|
*
|
||||||
|
* @param promise rejected promise
|
||||||
|
* @param operation HostPromiseRejectionTracker operation
|
||||||
|
*/
|
||||||
|
void
|
||||||
|
jerry_port_track_promise_rejection (const jerry_value_t promise,
|
||||||
|
const jerry_promise_rejection_operation_t operation)
|
||||||
|
{
|
||||||
|
(void) operation; /* unused */
|
||||||
|
|
||||||
|
jerry_value_t reason = jerry_get_promise_result (promise);
|
||||||
|
jerry_value_t reason_to_string = jerry_value_to_string (reason);
|
||||||
|
jerry_size_t req_sz = jerry_get_utf8_string_size (reason_to_string);
|
||||||
|
jerry_char_t str_buf_p[req_sz + 1];
|
||||||
|
jerry_string_to_utf8_char_buffer (reason_to_string, str_buf_p, req_sz);
|
||||||
|
str_buf_p[req_sz] = '\0';
|
||||||
|
|
||||||
|
jerry_release_value (reason_to_string);
|
||||||
|
jerry_release_value (reason);
|
||||||
|
|
||||||
|
jerry_port_log (JERRY_LOG_LEVEL_WARNING, "Uncaught (in promise) %s\n", str_buf_p);
|
||||||
|
} /* jerry_port_track_promise_rejection */
|
||||||
|
|||||||
Reference in New Issue
Block a user