diff options
author | Anna Henningsen <anna@addaleax.net> | 2019-11-03 13:00:24 +0100 |
---|---|---|
committer | Anna Henningsen <anna@addaleax.net> | 2019-11-06 13:57:55 +0100 |
commit | d80e49d6801501a0f2b93c442d5e425ed6fc73fb (patch) | |
tree | 959211f188647dab675a4980a2c0f65b9a37a34f /src/node.cc | |
parent | 369803175307dae7fd6b983d9270619f11bd7214 (diff) | |
download | android-node-v8-d80e49d6801501a0f2b93c442d5e425ed6fc73fb.tar.gz android-node-v8-d80e49d6801501a0f2b93c442d5e425ed6fc73fb.tar.bz2 android-node-v8-d80e49d6801501a0f2b93c442d5e425ed6fc73fb.zip |
src: use callback scope for main script
This allows removing custom code for setting the current async ids
and running nextTicks.
PR-URL: https://github.com/nodejs/node/pull/30236
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'src/node.cc')
-rw-r--r-- | src/node.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/node.cc b/src/node.cc index f437ea4be9..0b7fca544f 100644 --- a/src/node.cc +++ b/src/node.cc @@ -406,13 +406,8 @@ MaybeLocal<Value> StartExecution(Environment* env, const char* main_script_id) { ->GetFunction(env->context()) .ToLocalChecked()}; - Local<Value> result; - if (!ExecuteBootstrapper(env, main_script_id, ¶meters, &arguments) - .ToLocal(&result) || - !task_queue::RunNextTicksNative(env)) { - return MaybeLocal<Value>(); - } - return scope.Escape(result); + return scope.EscapeMaybe( + ExecuteBootstrapper(env, main_script_id, ¶meters, &arguments)); } MaybeLocal<Value> StartMainThreadExecution(Environment* env) { |