Skip to content
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.

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

[8.x] deps: V8: fix bug in InternalPerformPromiseThen #21426

Merged
merged 1 commit into from
Jul 1, 2018

Conversation

ofrobots
Copy link
Contributor

@ofrobots ofrobots commented Jun 20, 2018

This fix never landed upstream as it was not longer relevant to active V8 branches for Chromium.

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

/cc @nodejs/v8
@mhdawson this PR is also going to be blocked because of the infra issues with the V8-CI

CI: https://ci.nodejs.org/job/node-test-pull-request/15541/
V8-CI: https://ci.nodejs.org/view/All/job/node-test-commit-v8-linux/1498/

@nodejs-github-bot nodejs-github-bot added v8 engine Issues and PRs related to the V8 dependency. v8.x labels Jun 20, 2018
@ofrobots ofrobots changed the title deps: V8: fix bug in InternalPerformPromiseThen [8.x] deps: V8: fix bug in InternalPerformPromiseThen Jun 20, 2018
@ofrobots ofrobots requested a review from bnoordhuis June 20, 2018 19:07
@@ -509,8 +509,8 @@ Node* PromiseBuiltinsAssembler::InternalPerformPromiseThen(
BIND(&if_existingcallbacks);
{
Label if_singlecallback(this), if_multiplecallbacks(this);
BranchIfJSObject(existing_deferred_promise, &if_singlecallback,
&if_multiplecallbacks);
Branch(HasInstanceType(existing_deferred_promise, FIXED_ARRAY_TYPE),
Copy link
Member

Choose a reason for hiding this comment

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

You could also use Branch(IsFixedArray(existing_deferred_promise), ...) here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@ofrobots ofrobots added blocked PRs that are blocked by other issues or PRs. and removed blocked PRs that are blocked by other issues or PRs. labels Jun 28, 2018
This fix never landed upstream as it was not longer relevant to active
V8 branches for Chromium.

Original commit message:
  [turbofan] Fix bug in InternalPerformPromiseThen

  Bug: chromium:831170
  Change-Id: I1022fc360aafdfd392d6781eb50afc87a18096fd

PR-URL: nodejs#21426
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
@ofrobots ofrobots merged commit f1d9f16 into nodejs:v8.x-staging Jul 1, 2018
@ofrobots
Copy link
Contributor Author

ofrobots commented Jul 1, 2018

Landed on v8.x-staging as f1d9f16.

@ofrobots ofrobots deleted the fix/8/cr-831170 branch July 1, 2018 16:30
@MylesBorins MylesBorins mentioned this pull request Jul 9, 2018
rvagg pushed a commit that referenced this pull request Aug 16, 2018
This fix never landed upstream as it was not longer relevant to active
V8 branches for Chromium.

Original commit message:
  [turbofan] Fix bug in InternalPerformPromiseThen

  Bug: chromium:831170
  Change-Id: I1022fc360aafdfd392d6781eb50afc87a18096fd

PR-URL: #21426
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
v8 engine Issues and PRs related to the V8 dependency.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants