mirror of
https://github.com/denoland/deno.git
synced 2024-12-22 23:34:47 -05:00
Refactor exception handling, remove message listener callback (#4198)
This commit is contained in:
parent
b84f3efa14
commit
ba0991ad2b
2 changed files with 6 additions and 63 deletions
|
@ -1,8 +1,6 @@
|
||||||
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
|
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
|
||||||
|
|
||||||
use crate::es_isolate::EsIsolate;
|
use crate::es_isolate::EsIsolate;
|
||||||
use crate::isolate::encode_message_as_json;
|
|
||||||
use crate::isolate::handle_exception;
|
|
||||||
use crate::isolate::Isolate;
|
use crate::isolate::Isolate;
|
||||||
use crate::isolate::ZeroCopyBuf;
|
use crate::isolate::ZeroCopyBuf;
|
||||||
|
|
||||||
|
@ -33,9 +31,6 @@ lazy_static! {
|
||||||
v8::ExternalReference {
|
v8::ExternalReference {
|
||||||
getter: shared_getter.map_fn_to()
|
getter: shared_getter.map_fn_to()
|
||||||
},
|
},
|
||||||
v8::ExternalReference {
|
|
||||||
message: message_callback
|
|
||||||
},
|
|
||||||
v8::ExternalReference {
|
v8::ExternalReference {
|
||||||
function: queue_microtask.map_fn_to()
|
function: queue_microtask.map_fn_to()
|
||||||
},
|
},
|
||||||
|
@ -268,34 +263,6 @@ pub extern "C" fn host_initialize_import_meta_object_callback(
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
pub extern "C" fn message_callback(
|
|
||||||
message: v8::Local<v8::Message>,
|
|
||||||
_exception: v8::Local<v8::Value>,
|
|
||||||
) {
|
|
||||||
let mut cbs = v8::CallbackScope::new(message);
|
|
||||||
let mut hs = v8::HandleScope::new(cbs.enter());
|
|
||||||
let scope = hs.enter();
|
|
||||||
|
|
||||||
let deno_isolate: &mut Isolate =
|
|
||||||
unsafe { &mut *(scope.isolate().get_data(0) as *mut Isolate) };
|
|
||||||
|
|
||||||
// TerminateExecution was called
|
|
||||||
// TODO(piscisaureus): rusty_v8 should implement the
|
|
||||||
// `is_execution_terminating()` method on struct `Isolate` also.
|
|
||||||
if scope
|
|
||||||
.isolate()
|
|
||||||
.thread_safe_handle()
|
|
||||||
.is_execution_terminating()
|
|
||||||
{
|
|
||||||
let undefined = v8::undefined(scope).into();
|
|
||||||
handle_exception(scope, undefined, &mut deno_isolate.last_exception);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
let json_str = encode_message_as_json(scope, message);
|
|
||||||
deno_isolate.last_exception = Some(json_str);
|
|
||||||
}
|
|
||||||
|
|
||||||
pub extern "C" fn promise_reject_callback(message: v8::PromiseRejectMessage) {
|
pub extern "C" fn promise_reject_callback(message: v8::PromiseRejectMessage) {
|
||||||
let mut cbs = v8::CallbackScope::new(&message);
|
let mut cbs = v8::CallbackScope::new(&message);
|
||||||
let mut hs = v8::HandleScope::new(cbs.enter());
|
let mut hs = v8::HandleScope::new(cbs.enter());
|
||||||
|
|
|
@ -164,7 +164,6 @@ pub struct Isolate {
|
||||||
snapshot_creator: Option<v8::SnapshotCreator>,
|
snapshot_creator: Option<v8::SnapshotCreator>,
|
||||||
has_snapshotted: bool,
|
has_snapshotted: bool,
|
||||||
snapshot: Option<SnapshotConfig>,
|
snapshot: Option<SnapshotConfig>,
|
||||||
pub(crate) last_exception: Option<String>,
|
|
||||||
pub(crate) global_context: v8::Global<v8::Context>,
|
pub(crate) global_context: v8::Global<v8::Context>,
|
||||||
pub(crate) shared_ab: v8::Global<v8::SharedArrayBuffer>,
|
pub(crate) shared_ab: v8::Global<v8::SharedArrayBuffer>,
|
||||||
pub(crate) js_recv_cb: v8::Global<v8::Function>,
|
pub(crate) js_recv_cb: v8::Global<v8::Function>,
|
||||||
|
@ -297,7 +296,6 @@ impl Isolate {
|
||||||
|
|
||||||
let core_isolate = Self {
|
let core_isolate = Self {
|
||||||
v8_isolate: None,
|
v8_isolate: None,
|
||||||
last_exception: None,
|
|
||||||
global_context,
|
global_context,
|
||||||
pending_promise_exceptions: HashMap::new(),
|
pending_promise_exceptions: HashMap::new(),
|
||||||
shared_ab: v8::Global::<v8::SharedArrayBuffer>::new(),
|
shared_ab: v8::Global::<v8::SharedArrayBuffer>::new(),
|
||||||
|
@ -335,7 +333,6 @@ impl Isolate {
|
||||||
pub fn setup_isolate(mut isolate: v8::OwnedIsolate) -> v8::OwnedIsolate {
|
pub fn setup_isolate(mut isolate: v8::OwnedIsolate) -> v8::OwnedIsolate {
|
||||||
isolate.set_capture_stack_trace_for_uncaught_exceptions(true, 10);
|
isolate.set_capture_stack_trace_for_uncaught_exceptions(true, 10);
|
||||||
isolate.set_promise_reject_callback(bindings::promise_reject_callback);
|
isolate.set_promise_reject_callback(bindings::promise_reject_callback);
|
||||||
isolate.add_message_listener(bindings::message_callback);
|
|
||||||
isolate
|
isolate
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -620,17 +617,6 @@ pub(crate) fn exception_to_err_result<'a, T>(
|
||||||
exception: v8::Local<v8::Value>,
|
exception: v8::Local<v8::Value>,
|
||||||
js_error_create_fn: &JSErrorCreateFn,
|
js_error_create_fn: &JSErrorCreateFn,
|
||||||
) -> Result<T, ErrBox> {
|
) -> Result<T, ErrBox> {
|
||||||
let mut last_exception = Option::<String>::None;
|
|
||||||
handle_exception(scope, exception, &mut last_exception);
|
|
||||||
check_last_exception(&mut last_exception, js_error_create_fn)
|
|
||||||
.map(|_| unreachable!())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(crate) fn handle_exception<'a>(
|
|
||||||
scope: &mut impl v8::ToLocal<'a>,
|
|
||||||
exception: v8::Local<v8::Value>,
|
|
||||||
last_exception: &mut Option<String>, // Out parameter.
|
|
||||||
) {
|
|
||||||
// Use a HandleScope because the functions below create a lot of
|
// Use a HandleScope because the functions below create a lot of
|
||||||
// local handles (in particular, `encode_message_as_json()` does).
|
// local handles (in particular, `encode_message_as_json()` does).
|
||||||
let mut hs = v8::HandleScope::new(scope);
|
let mut hs = v8::HandleScope::new(scope);
|
||||||
|
@ -663,9 +649,11 @@ pub(crate) fn handle_exception<'a>(
|
||||||
}
|
}
|
||||||
|
|
||||||
let message = v8::Exception::create_message(scope, exception);
|
let message = v8::Exception::create_message(scope, exception);
|
||||||
let json_str = encode_message_as_json(scope, message);
|
// TODO(piscisaureus): don't encode the message as json first and then
|
||||||
let prev_last_exception = last_exception.replace(json_str);
|
// immediately parse it after.
|
||||||
assert_eq!(prev_last_exception, None);
|
let exception_json_str = encode_message_as_json(scope, message);
|
||||||
|
let v8_exception = V8Exception::from_json(&exception_json_str).unwrap();
|
||||||
|
let js_error = (js_error_create_fn)(v8_exception);
|
||||||
|
|
||||||
if is_terminating_exception {
|
if is_terminating_exception {
|
||||||
// Re-enable exception termination.
|
// Re-enable exception termination.
|
||||||
|
@ -673,20 +661,8 @@ pub(crate) fn handle_exception<'a>(
|
||||||
// be implemented on `struct Isolate`.
|
// be implemented on `struct Isolate`.
|
||||||
scope.isolate().thread_safe_handle().terminate_execution();
|
scope.isolate().thread_safe_handle().terminate_execution();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
pub(crate) fn check_last_exception(
|
Err(js_error)
|
||||||
last_exception: &mut Option<String>,
|
|
||||||
js_error_create_fn: &JSErrorCreateFn,
|
|
||||||
) -> Result<(), ErrBox> {
|
|
||||||
match last_exception.take() {
|
|
||||||
None => Ok(()),
|
|
||||||
Some(json_str) => {
|
|
||||||
let v8_exception = V8Exception::from_json(&json_str).unwrap();
|
|
||||||
let js_error = (js_error_create_fn)(v8_exception);
|
|
||||||
Err(js_error)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn check_promise_exceptions<'s>(
|
fn check_promise_exceptions<'s>(
|
||||||
|
|
Loading…
Reference in a new issue