Skip to content

src: merge RunInThisContext() with RunInContext() #43225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nodejs-github-bot merged 4 commits into from
Jul 11, 2022
Merged

src: merge RunInThisContext() with RunInContext() #43225

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef91b0e
src: merge RunInThisContext() with RunInContext()
daeyeon May 27, 2022
21963fe
fixup: remove the trace event name
daeyeon Jun 1, 2022
ff52370
fixup: remove the function declaration
daeyeon Jun 1, 2022
06a97fd
fixup: merge eval_env with env
daeyeon Jun 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fixup: merge eval_env with env 
Signed-off-by: Daeyeon Jeong daeyeon.dev@gmail.com
  • Loading branch information
@daeyeon
daeyeon committed Jul 8, 2022
commit 06a97fd604d8dfbd74a9b9795287bd5ad5cc4bad
6 changes: 2 additions & 4 deletions src/node_contextify.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,7 +852,6 @@ void ContextifyScript::RunInContext(const FunctionCallbackInfo<Value>& args) {
CHECK(args[0]->IsObject() || args[0]->IsNull());

Local<Context> context;
Environment* eval_env = nullptr;
std::shared_ptr<v8::MicrotaskQueue> microtask_queue;

if (args[0]->IsObject()) {
Expand All @@ -861,14 +860,13 @@ void ContextifyScript::RunInContext(const FunctionCallbackInfo<Value>& args) {
ContextifyContext* contextify_context =
ContextifyContext::ContextFromContextifiedSandbox(env, sandbox);
CHECK_NOT_NULL(contextify_context);
CHECK_EQ(contextify_context->env(), env);

context = contextify_context->context();
if (context.IsEmpty()) return;

eval_env = contextify_context->env();
microtask_queue = contextify_context->microtask_queue();
} else {
eval_env = env;
context = env->context();
}

Expand All @@ -888,7 +886,7 @@ void ContextifyScript::RunInContext(const FunctionCallbackInfo<Value>& args) {

// Do the eval within the context
Context::Scope context_scope(context);
EvalMachine(eval_env,
EvalMachine(env,
timeout,
display_errors,
break_on_sigint,
Expand Down