[v12.x] Backport 33570 and 33508 to v12.x#33819
Closed
gabrielschulhof wants to merge 1 commit intonodejs:v12.x-stagingfrom
Closed
[v12.x] Backport 33570 and 33508 to v12.x#33819gabrielschulhof wants to merge 1 commit intonodejs:v12.x-stagingfrom
gabrielschulhof wants to merge 1 commit intonodejs:v12.x-stagingfrom
Conversation
nodejs-github-bot
added
c++
addaleax
approved these changes
Jun 10, 2020
legendecas
approved these changes
Jun 11, 2020
Collaborator
Contributor
Author
|
@codebytere could we please have this PR in 12.18.3? |
Contributor
Author
|
... it's blocking some work on node-addon-api (nodejs/node-addon-api#738) and causing nodejs/node-addon-api#730. |
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
Contributor
Author
|
One of the commits (n-api: remove |
Contributor
Author
|
The remaining commit in this PR is a backport of 362e4a1, which currently applies cleanly when cherry-picked onto v12.x-staging. |
Contributor
Author
|
The remaining commit landed as 90ddf0a. Thanks @codebytere! |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
#33508 cannot be backported directly, but must be preceded with a backport of #33570.
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passes