Skip to content

vm: lazily initialize primordials for vm contexts #31738

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

Closed
joyeecheung wants to merge 2 commits into from
Closed

vm: lazily initialize primordials for vm contexts #31738

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6b9d2a
vm: lazily initialize primordials for vm contexts
joyeecheung Feb 11, 2020
2c79633
fixup! vm: lazily initialize primordials for vm contexts
joyeecheung Feb 11, 2020
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! vm: lazily initialize primordials for vm contexts
  • Loading branch information
@joyeecheung
joyeecheung committed Feb 11, 2020
commit 2c796330f0f93d64fe47ff36427c93c2d71a9940
4 changes: 2 additions & 2 deletions src/api/environment.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,9 +405,9 @@ MaybeLocal<Object> GetPerContextExports(Local<Context> context) {
return handle_scope.Escape(existing_value.As<Object>());

Local<Object> exports = Object::New(isolate);
if (context->Global()->SetPrivate(context, key, exports).IsNothing())
if (context->Global()->SetPrivate(context, key, exports).IsNothing() ||
!InitializePrimordials(context))
Copy link
Copy Markdown
Member Author

@joyeecheung joyeecheung Feb 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, forgot to handle the return value of InitializePrimordials in the initial commit, fixed.

return MaybeLocal<Object>();
InitializePrimordials(context);
return handle_scope.Escape(exports);
}

Expand Down