Skip to content

[v12.x] Backport 33570 and 33508 to v12.x #33819

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

Jump to bottom
Closed
wants to merge 1 commit into from
Closed

[v12.x] Backport 33570 and 33508 to v12.x #33819

wants to merge 1 commit into from

Conversation

gabrielschulhof
Copy link
Contributor

#33508 cannot be backported directly, but must be preceded with a backport of #33570.

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • commit message follows commit guidelines

@nodejs-github-bot nodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. node-api Issues and PRs related to the Node-API. v12.x labels Jun 10, 2020
mhdawson
mhdawson approved these changes Jun 11, 2020
View reviewed changes
Copy link
Member

@mhdawson mhdawson left a comment

Choose a reason for hiding this comment

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

LGTM

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/31847/

@gabrielschulhof
Copy link
Contributor Author

@codebytere could we please have this PR in 12.18.3?

@gabrielschulhof
Copy link
Contributor Author

... it's blocking some work on node-addon-api (nodejs/node-addon-api#738) and causing nodejs/node-addon-api#730.

@mhdawson
n-api: ensure scope present for finalization
344889e 
Refs: nodejs/node-addon-api#722

Ensure a scope is on stack during finalization
as finalization functions can create JS Objects

Signed-off-by: Michael Dawson <[email protected]>

PR-URL: nodejs#33508
Reviewed-By: Gabriel Schulhof <[email protected]>
Reviewed-By: James M Snell <[email protected]>
@gabrielschulhof gabrielschulhof force-pushed the backport-33508-to-v12.x branch from 8821399 to 344889e Compare July 8, 2020 23:30
@gabrielschulhof
Copy link
Contributor Author

One of the commits (n-api: remove napi_env::CallIntoModuleThrow – ed741ec) has now landed on v12.x-staging, so dropping it from the PR.

@gabrielschulhof
Copy link
Contributor Author

The remaining commit in this PR is a backport of 362e4a1, which currently applies cleanly when cherry-picked onto v12.x-staging.

@gabrielschulhof
Copy link
Contributor Author

The remaining commit landed as 90ddf0a. Thanks @codebytere!

@gabrielschulhof gabrielschulhof deleted the backport-33508-to-v12.x branch July 10, 2020 18:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@addaleax addaleax addaleax approved these changes

@legendecas legendecas legendecas approved these changes

@mhdawson mhdawson mhdawson approved these changes

Assignees
No one assigned
Labels
c++ Issues and PRs that require attention from people who are familiar with C++. node-api Issues and PRs related to the Node-API.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@gabrielschulhof @nodejs-github-bot @addaleax @legendecas @mhdawson