diff --git a/src/node.cc b/src/node.cc index c0e8dbcd44d..35ca49451a4 100644 --- a/src/node.cc +++ b/src/node.cc @@ -1604,7 +1604,7 @@ static Local ExecuteString(Environment* env, Local source, Local filename) { EscapableHandleScope scope(env->isolate()); - TryCatch try_catch; + TryCatch try_catch(env->isolate()); // try_catch must be nonverbose to disable FatalException() handler, // we will handle exceptions ourself. @@ -2327,7 +2327,7 @@ void FatalException(Isolate* isolate, exit(6); } - TryCatch fatal_try_catch; + TryCatch fatal_try_catch(isolate); // Do not call FatalException when _fatalException handler throws fatal_try_catch.SetVerbose(false); @@ -3176,7 +3176,7 @@ void LoadEnvironment(Environment* env) { // The node.js file returns a function 'f' atexit(AtExit); - TryCatch try_catch; + TryCatch try_catch(env->isolate()); // Disable verbose mode to stop FatalException() handler from trying // to handle the exception. Errors this early in the start-up phase diff --git a/src/node_contextify.cc b/src/node_contextify.cc index 800ab9f22b7..ade8f4379c2 100644 --- a/src/node_contextify.cc +++ b/src/node_contextify.cc @@ -283,7 +283,7 @@ class ContextifyContext { env->context(), env->contextify_private_symbol()).FromJust()); - TryCatch try_catch; + TryCatch try_catch(env->isolate()); ContextifyContext* context = new ContextifyContext(env, sandbox); if (try_catch.HasCaught()) { @@ -493,7 +493,7 @@ class ContextifyScript : public BaseObject { ContextifyScript* contextify_script = new ContextifyScript(env, args.This()); - TryCatch try_catch; + TryCatch try_catch(env->isolate()); Local code = args[0]->ToString(env->isolate()); Local filename = GetFilenameArg(args, 1); Local lineOffset = GetLineOffsetArg(args, 1); @@ -569,7 +569,7 @@ class ContextifyScript : public BaseObject { // args: [options] static void RunInThisContext(const FunctionCallbackInfo& args) { // Assemble arguments - TryCatch try_catch; + TryCatch try_catch(args.GetIsolate()); uint64_t timeout = GetTimeoutArg(args, 0); bool display_errors = GetDisplayErrorsArg(args, 0); if (try_catch.HasCaught()) { @@ -597,7 +597,7 @@ class ContextifyScript : public BaseObject { Local sandbox = args[0].As(); { - TryCatch try_catch; + TryCatch try_catch(env->isolate()); timeout = GetTimeoutArg(args, 1); display_errors = GetDisplayErrorsArg(args, 1); if (try_catch.HasCaught()) { @@ -618,7 +618,7 @@ class ContextifyScript : public BaseObject { return; { - TryCatch try_catch; + TryCatch try_catch(env->isolate()); // Do the eval within the context Context::Scope context_scope(contextify_context->context()); if (EvalMachine(contextify_context->env(),