Skip to content

n-api: factor out calling pattern - #36113

Closed
gabrielschulhof wants to merge 3 commits into
nodejs:masterfrom
gabrielschulhof:status-call
Closed

n-api: factor out calling pattern#36113
gabrielschulhof wants to merge 3 commits into
nodejs:masterfrom
gabrielschulhof:status-call

Conversation

@gabrielschulhof

@gabrielschulhofgabrielschulhof commented Nov 13, 2020

Copy link
Copy Markdown
Contributor

Factor out how we handle a napi_status-valued return internally.

Signed-off-by: Gabriel Schulhof gabriel.schulhof@intel.com

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • commit message follows commit guidelines

Gabriel Schulhof
n-api: factor out calling pattern
58e9258
Factor out how we handle a `napi_status`-valued return internally.
Signed-off-by: Gabriel Schulhof <gabriel.schulhof@intel.com>
@nodejs-github-bot

nodejs-github-bot commented Nov 13, 2020

Copy link
Copy Markdown
Collaborator

Review requested:

  • @nodejs/n-api

@nodejs-github-botnodejs-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. labels Nov 13, 2020
@gabrielschulhof
gabrielschulhof requested review from Qard, addaleax and mhdawson and removed request for addaleaxNovember 13, 2020 21:21
addaleax
addaleax reviewed Nov 15, 2020
View reviewed changes
Comment threadsrc/js_native_api_v8.h Outdated
legendecas
legendecas reviewed Nov 15, 2020
View reviewed changes
Comment threadsrc/js_native_api_v8.cc
v8impl::V8NameFromPropertyDescriptor(env, p, &property_name);

if (status != napi_ok) {
return napi_set_last_error(env, status);

@legendecaslegendecasNov 15, 2020•
edited
Loading

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.

STATUS_CALL simply returns on non-napi_ok without calling napi_set_last_error. The behavior seems not equivalent with the change. Is this intentional?

@gabrielschulhofgabrielschulhofNov 15, 2020

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

@legendecas yes, it is, because it is assumed that whichever call returned non-napi_ok did so via return napi_set_last_error(napi_<not_ok>); I checked to make sure that was the case in all locations where I made the change.

Gabriel Schulhof@addaleax
fixup! Update src/js_native_api_v8.h
8e4b575
Remove semicolon from macro definition
Co-authored-by: Anna Henningsen <github@addaleax.net>
@nodejs-github-bot

nodejs-github-bot commented Nov 16, 2020

Copy link
Copy Markdown
Collaborator

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

gabrielschulhof pushed a commit that referenced this pull request Nov 16, 2020
Gabriel Schulhof
n-api: factor out calling pattern
2fd2235
Factor out how we handle a `napi_status`-valued return internally.
Signed-off-by: Gabriel Schulhof <gabriel.schulhof@intel.com>
PR-URL: #36113
Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
@gabrielschulhof

gabrielschulhof commented Nov 16, 2020

Copy link
Copy Markdown
ContributorAuthor

Landed in 2fd2235.

@gabrielschulhof
gabrielschulhof deleted the status-call branch November 16, 2020 05:52
codebytere pushed a commit that referenced this pull request Nov 22, 2020
Gabriel Schulhof@codebytere
n-api: factor out calling pattern
89da0c3
Factor out how we handle a `napi_status`-valued return internally.
Signed-off-by: Gabriel Schulhof <gabriel.schulhof@intel.com>
PR-URL: #36113
Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
@codebyterecodebytere mentioned this pull request Nov 22, 2020
Merged
BethGriggs pushed a commit that referenced this pull request Dec 9, 2020
Gabriel Schulhof@BethGriggs
n-api: factor out calling pattern
d679570
Factor out how we handle a `napi_status`-valued return internally.
Signed-off-by: Gabriel Schulhof <gabriel.schulhof@intel.com>
PR-URL: #36113
Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
BethGriggs pushed a commit that referenced this pull request Dec 10, 2020
Gabriel Schulhof@BethGriggs
n-api: factor out calling pattern
9282b45
Factor out how we handle a `napi_status`-valued return internally.
Signed-off-by: Gabriel Schulhof <gabriel.schulhof@intel.com>
PR-URL: #36113
Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
@BethGriggsBethGriggs mentioned this pull request Dec 10, 2020
Merged
BethGriggs pushed a commit that referenced this pull request Dec 15, 2020
Gabriel Schulhof@BethGriggs
n-api: factor out calling pattern
08657e7
Factor out how we handle a `napi_status`-valued return internally.
Signed-off-by: Gabriel Schulhof <gabriel.schulhof@intel.com>
PR-URL: #36113
Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@addaleaxaddaleaxaddaleax left review comments
@legendecaslegendecaslegendecas left review comments
@QardQardQard approved these changes
@TrottTrottTrott approved these changes
@mhdawsonmhdawsonAwaiting requested review from mhdawson

Assignees

No one assigned

Labels

c++Issues and PRs that require attention from people who are familiar with C++.node-apiIssues and PRs related to the Node-API.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@gabrielschulhof@nodejs-github-bot@Qard@Trott@addaleax@legendecas