Skip to content

tools: fix js2c regression#27980

Closed
refack wants to merge 2 commits intonodejs:masterfrom
refack:fix-js2c-regression
Closed

tools: fix js2c regression#27980
refack wants to merge 2 commits intonodejs:masterfrom
refack:fix-js2c-regression

Conversation

@refack
Copy link
Contributor

@refack refack commented May 30, 2019 •
edited
Loading

Fix a regression that was introduced in #25518 and causes the binary to bloat by ~10%.

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

@refack refack requested review from cclauss and joyeecheung May 30, 2019 15:56
@refack refack added python PRs and issues that require attention from people who are familiar with Python. tools Issues and PRs related to the tools directory. regression Issues related to regressions. labels May 30, 2019
@nodejs-github-bot

This comment has been minimized.

Sign in to view
refack
refack commented May 30, 2019
View reviewed changes
@refack refack mentioned this pull request May 30, 2019
Merged
3 tasks
@refack refack force-pushed the fix-js2c-regression branch from f473fa2 to e302589 Compare May 30, 2019 21:13
@nodejs-github-bot

This comment has been minimized.

Sign in to view
@refack refack force-pushed the fix-js2c-regression branch from e302589 to 84aca5c Compare May 30, 2019 21:30
@nodejs-github-bot

This comment has been minimized.

Sign in to view
joyeecheung
joyeecheung reviewed May 30, 2019
View reviewed changes
test/cctest/test_per_process.cc Outdated
Copy link
Member

@joyeecheung joyeecheung May 30, 2019

Choose a reason for hiding this comment

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

The builds are failing because this is private. I guess it would also make sense to add a public method to just return the source in a copy, though.

Copy link
Contributor Author

@refack refack May 30, 2019

Choose a reason for hiding this comment

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

I made it a friend
https://github.com/nodejs/node/blob/84aca5ca594f86ce9b6b86e6af039e78f90deaef/src/node_native_module.h#L89
and it compiles & passes with MSVC, now I need to figure out gcc & clang 🤷‍♂

Copy link
Contributor Author

@refack refack May 30, 2019

Choose a reason for hiding this comment

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

Seems like it was a namespace issue
https://github.com/nodejs/node/blob/c178598d309319e9a9e9692d6560a9205cd1b307/src/node_native_module.h#L89

@nodejs-github-bot

This comment has been minimized.

Sign in to view
@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented May 31, 2019

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

targos
targos approved these changes May 31, 2019
View reviewed changes
bnoordhuis
bnoordhuis approved these changes Jun 1, 2019
View reviewed changes
Copy link
Member

@bnoordhuis bnoordhuis left a comment

Choose a reason for hiding this comment

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

LGTM. Nice work.

tools/js2c.py Outdated
Copy link
Member

@bnoordhuis bnoordhuis Jun 1, 2019

Choose a reason for hiding this comment

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

Can you wrap this, e.g. by putting the for i in ... on its own line, lining it up with the e in [encoded_source?

Copy link
Contributor Author

@refack refack Jun 1, 2019

Choose a reason for hiding this comment

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

Done.

@refack refack force-pushed the fix-js2c-regression branch from 8494bba to 6b0295c Compare June 1, 2019 14:36
@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented Jun 2, 2019

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

@Trott
Copy link
Member

Trott commented Jun 2, 2019

Landed in cb92d24

@Trott Trott closed this Jun 2, 2019
Trott pushed a commit to Trott/io.js that referenced this pull request Jun 2, 2019
@refack @Trott
tools: fix js2c regression
cb92d24 
PR-URL: nodejs#27980
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
@refack refack added the landed label Jun 2, 2019
@refack refack deleted the fix-js2c-regression branch June 2, 2019 16:18
@refack refack removed the request for review from cclauss June 2, 2019 16:18
targos pushed a commit that referenced this pull request Jun 3, 2019
@refack @targos
tools: fix js2c regression
2ce24a9 
PR-URL: #27980
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
@targos targos mentioned this pull request Jun 3, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bnoordhuis bnoordhuis bnoordhuis approved these changes

@targos targos targos approved these changes

@joyeecheung joyeecheung joyeecheung approved these changes

Assignees

No one assigned

Labels

python PRs and issues that require attention from people who are familiar with Python. regression Issues related to regressions. tools Issues and PRs related to the tools directory.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@refack @nodejs-github-bot @Trott @bnoordhuis @targos @joyeecheung