FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

[v12.x] Backport 33570 and 33508 to v12.x by gabrielschulhof · Pull Request #33819 · nodejs/node · GitHub

/ node Public

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

Closed
gabrielschulhof wants to merge 1 commit into
nodejs:v12.x-stagingfrom
gabrielschulhof:backport-33508-to-v12.x
ConversationCommits (1)ChecksFiles changed
Closed

[v12.x] Backport 33570 and 33508 to v12.x#33819
gabrielschulhof wants to merge 1 commit into
nodejs:v12.x-stagingfrom
gabrielschulhof:backport-33508-to-v12.x

Conversation

gabrielschulhof commented Jun 10, 2020

Copy link
Copy Markdown
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 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 approved these changes Jun 11, 2020
View reviewed changes

mhdawson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

LGTM

nodejs-github-bot commented Jun 12, 2020

Copy link
Copy Markdown
Collaborator

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

gabrielschulhof commented Jun 29, 2020

Copy link
Copy Markdown
Contributor Author

@codebytere could we please have this PR in 12.18.3?

gabrielschulhof commented Jun 29, 2020

Copy link
Copy Markdown
Contributor Author

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

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 <michael_dawson@ca.ibm.com>

PR-URL: nodejs#33508
Reviewed-By: Gabriel Schulhof <gabriel.schulhof@intel.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
gabrielschulhof force-pushed the backport-33508-to-v12.x branch from 8821399 to 344889e Compare July 8, 2020 23:30

gabrielschulhof commented Jul 8, 2020

Copy link
Copy Markdown
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 commented Jul 8, 2020

Copy link
Copy Markdown
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 commented Jul 10, 2020

Copy link
Copy Markdown
Contributor Author

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

gabrielschulhof deleted the backport-33508-to-v12.x branch July 10, 2020 18:44
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

addaleax addaleax approved these changes
legendecas legendecas approved these changes
+1 more reviewer
mhdawson mhdawson approved these changes
Reviewers whose approvals may not affect merge requirements

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

Back | FazBrowse Home | New Git URL