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

Jump to bottom

deps: V8: backport 4263f8a5e8e0 #35650

Closed
wants to merge 2 commits into from
Closed

deps: V8: backport 4263f8a5e8e0 #35650

wants to merge 2 commits into from

Conversation

bdougie
Copy link
Contributor

@bdougie bdougie commented Oct 14, 2020

Original commit message:

parser: better error message for await+tla

Bug: v8:9344, v8:6513
Change-Id: I1854e483515e7da99192367b6764a0ec7c8b41d9
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2411687
Reviewed-by: Marja Hölttä <marja@chromium.org>
Commit-Queue: Gus Caplan <snek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#70099}

Refs: v8/v8@4263f8a

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

@nodejs-github-bot nodejs-github-bot added build v8 engine labels Oct 14, 2020
@bdougie
Copy link
Contributor Author

@bdougie bdougie commented Oct 14, 2020 •
edited

re: #35196 (comment)

I originally opened the above PR updating the error messages. That was instead landed upstream. This backport adds those changes and closes out #35196

@MylesBorins MylesBorins mentioned this pull request Oct 14, 2020
Closed
4 tasks
@nodejs-github-bot
Copy link
Contributor

@nodejs-github-bot nodejs-github-bot commented Oct 14, 2020 •
edited by MylesBorins

CI: https://ci.nodejs.org/job/node-test-pull-request/33628/
V8-CI: https://ci.nodejs.org/job/node-test-commit-v8-linux/3466/

MylesBorins
MylesBorins reviewed Oct 14, 2020
View changes
Copy link
Member

@MylesBorins MylesBorins left a comment

some tiny issues with conflict resolution

deps/v8/test/cctest/interpreter/bytecode_expectations/PrivateMethodAccess.golden Show resolved Hide resolved
deps/v8/test/cctest/interpreter/bytecode_expectations/PrivateMethodAccess.golden Show resolved Hide resolved
deps/v8/test/cctest/interpreter/bytecode_expectations/PrivateAccessorAccess.golden Outdated Show resolved Hide resolved
deps/v8/test/cctest/interpreter/bytecode_expectations/PrivateAccessorAccess.golden Outdated Show resolved Hide resolved
deps/v8/test/cctest/interpreter/bytecode_expectations/PrivateAccessorAccess.golden Outdated Show resolved Hide resolved
deps/v8/test/cctest/interpreter/bytecode_expectations/PrivateAccessorAccess.golden Outdated Show resolved Hide resolved
@nodejs-github-bot
Copy link
Contributor

@nodejs-github-bot nodejs-github-bot commented Oct 14, 2020 •
edited by MylesBorins

CI: https://ci.nodejs.org/job/node-test-pull-request/33629/
V8-CI: https://ci.nodejs.org/job/node-test-commit-v8-linux/3467/

@MylesBorins
Copy link
Member

@MylesBorins MylesBorins commented Oct 15, 2020

@devsnek any idea why the V8 tests are failing?

@bdougie
Copy link
Contributor Author

@bdougie bdougie commented Oct 15, 2020 •
edited

The failures are in files that I touched (fixed merge conflicts). Curious if it is a white space thing or similar.

:53: Uncaught TypeError: '#b' was defined without a setter
:46: Uncaught TypeError: '#c' was defined without a getter
:61: Uncaught TypeError: '#d' was defined without a setter
:46: Uncaught TypeError: '#e' was defined without a getter
stderr:
Generated has extra lines after line 182
Generated: ''

@MylesBorins
Copy link
Member

@MylesBorins MylesBorins commented Oct 16, 2020

/cc @nodejs/v8-update

@Trott
Copy link
Member

@Trott Trott commented Oct 21, 2020 •
edited

I believe V8-CI skips rebasing by default. I ran it again, but this time rebasing to see if that fixed things. https://ci.nodejs.org/job/node-test-commit-v8-linux/3493/ It reported that it couldn't rebase, which is a known issue in our CI with merge commits. I'll force-push out the merge commit from @MylesBorins and try again...

@Trott Trott force-pushed the bdougie-v8-backport branch 2 times, most recently from 678b58e to eb1aac1 Compare Oct 21, 2020
@Trott
Copy link
Member

@Trott Trott commented Oct 21, 2020

V8-CI: https://ci.nodejs.org/job/node-test-commit-v8-linux/3494/

Trott
Trott approved these changes Oct 21, 2020
View changes
Copy link
Member

@Trott Trott left a comment

LGTM if we can get the V8 CI to pass

@codecov-io

This comment has been hidden.

Sign in to view
@MylesBorins
Copy link
Member

@MylesBorins MylesBorins commented Oct 21, 2020

@Trott the issue with CI is that the .golden files need to be regenerated and afaict there is no easy way for us to do this. @devsnek was looking into this, and I believe chatted with @joyeecheung about it to.

Maybe someone from @nodejs/v8-update would know how to help.

@joyeecheung
Copy link
Member

@joyeecheung joyeecheung commented Oct 21, 2020

The failures are in files that I touched (fixed merge conflicts). Curious if it is a white space thing or similar.

Yes you need to remove the whitespace changes.

@joyeecheung
Copy link
Member

@joyeecheung joyeecheung commented Oct 21, 2020 •
edited

Looks like the CI jobs are still failing because of git issues

stderr: error: you need to resolve your current index first

@bdougie @MylesBorins
deps: V8: backport 4263f8a5e8e0
ff9c811 
Original commit message:

    parser: better error message for await+tla

    Bug: v8:9344, v8:6513
    Change-Id: I1854e483515e7da99192367b6764a0ec7c8b41d9
    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2411687
    Reviewed-by: Marja Hölttä <marja@chromium.org>
    Commit-Queue: Gus Caplan <snek@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#70099}

Refs: v8/v8@4263f8a
@MylesBorins
Copy link
Member

@MylesBorins MylesBorins commented Oct 21, 2020 •
edited

@joyeecheung it looks like the updates to the golden files from the original CL got lost when we updated V8 on master. I've re-applied the changes

edit:

Another crack at V8-CI https://ci.nodejs.org/job/node-test-commit-v8-linux/3495/

@joyeecheung
Copy link
Member

@joyeecheung joyeecheung commented Oct 21, 2020 •
edited

I did a rebaseline locally and this is the patch I get (compared to the state after this force push) and it passes the cctest locally. Should I update this branch?

See diff 
diff --git a/deps/v8/test/cctest/interpreter/bytecode_expectations/StaticPrivateMethodAccess.golden b/deps/v8/test/cctest/interpreter/bytecode_expectations/StaticPrivateMethodAccess.golden
index 5ce6e397..6d5bb4a5 100644
--- a/deps/v8/test/cctest/interpreter/bytecode_expectations/StaticPrivateMethodAccess.golden
+++ b/deps/v8/test/cctest/interpreter/bytecode_expectations/StaticPrivateMethodAccess.golden
@@ -25,7 +25,7 @@ bytecodes: [
                 B(TestReferenceEqual), R(this),
                 B(Mov), R(this), R(1),
                 B(JumpIfTrue), U8(18),
-                B(Wide), B(LdaSmi), I16(262),
+                B(Wide), B(LdaSmi), I16(263),
                 B(Star), R(2),
                 B(LdaConstant), U8(0),
                 B(Star), R(3),
@@ -56,7 +56,7 @@ frame size: 2
 parameter count: 1
 bytecode array length: 16
 bytecodes: [
-  /*   56 S> */ B(Wide), B(LdaSmi), I16(264),
+  /*   56 S> */ B(Wide), B(LdaSmi), I16(265),
                 B(Star), R(0),
                 B(LdaConstant), U8(0),
                 B(Star), R(1),
@@ -83,7 +83,7 @@ frame size: 2
 parameter count: 1
 bytecode array length: 16
 bytecodes: [
-  /*   56 S> */ B(Wide), B(LdaSmi), I16(264),
+  /*   56 S> */ B(Wide), B(LdaSmi), I16(265),
                 B(Star), R(0),
                 B(LdaConstant), U8(0),
                 B(Star), R(1),
@@ -122,7 +122,7 @@ bytecodes: [
   /*   94 E> */ B(TestReferenceEqual), R(this),
                 B(Mov), R(this), R(0),
                 B(JumpIfTrue), U8(18),
-                B(Wide), B(LdaSmi), I16(262),
+                B(Wide), B(LdaSmi), I16(263),
                 B(Star), R(2),
                 B(LdaConstant), U8(0),
                 B(Star), R(3),
@@ -144,7 +144,7 @@ bytecodes: [
   /*  109 E> */ B(TestReferenceEqual), R(this),
                 B(Mov), R(this), R(1),
                 B(JumpIfTrue), U8(18),
-                B(Wide), B(LdaSmi), I16(263),
+                B(Wide), B(LdaSmi), I16(264),
                 B(Star), R(3),
                 B(LdaConstant), U8(0),
                 B(Star), R(4),
@@ -159,7 +159,7 @@ bytecodes: [
   /*  133 E> */ B(TestReferenceEqual), R(this),
                 B(Mov), R(this), R(0),
                 B(JumpIfTrue), U8(18),
-                B(Wide), B(LdaSmi), I16(262),
+                B(Wide), B(LdaSmi), I16(263),
                 B(Star), R(2),
                 B(LdaConstant), U8(0),
                 B(Star), R(3),
@@ -189,7 +189,7 @@ frame size: 2
 parameter count: 1
 bytecode array length: 16
 bytecodes: [
-  /*   60 S> */ B(Wide), B(LdaSmi), I16(266),
+  /*   60 S> */ B(Wide), B(LdaSmi), I16(267),
                 B(Star), R(0),
                 B(LdaConstant), U8(0),
                 B(Star), R(1),
@@ -215,7 +215,7 @@ frame size: 2
 parameter count: 1
 bytecode array length: 16
 bytecodes: [
-  /*   53 S> */ B(Wide), B(LdaSmi), I16(265),
+  /*   53 S> */ B(Wide), B(LdaSmi), I16(266),
                 B(Star), R(0),
                 B(LdaConstant), U8(0),
                 B(Star), R(1),
@@ -241,7 +241,7 @@ frame size: 2
 parameter count: 1
 bytecode array length: 16
 bytecodes: [
-  /*   60 S> */ B(Wide), B(LdaSmi), I16(266),
+  /*   60 S> */ B(Wide), B(LdaSmi), I16(267),
                 B(Star), R(0),
                 B(LdaConstant), U8(0),
                 B(Star), R(1),
@@ -267,7 +267,7 @@ frame size: 3
 parameter count: 1
 bytecode array length: 16
 bytecodes: [
-  /*   46 S> */ B(Wide), B(LdaSmi), I16(265),
+  /*   46 S> */ B(Wide), B(LdaSmi), I16(266),
                 B(Star), R(1),
                 B(LdaConstant), U8(0),
                 B(Star), R(2),

@MylesBorins
Copy link
Member

@MylesBorins MylesBorins commented Oct 21, 2020 •
edited

Another V8 CI https://ci.nodejs.org/job/node-test-commit-v8-linux/3501/

@MylesBorins MylesBorins added the request-ci label Oct 21, 2020
@github-actions github-actions bot removed the request-ci label Oct 21, 2020
@nodejs-github-bot
Copy link
Contributor

@nodejs-github-bot nodejs-github-bot commented Oct 21, 2020

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

MylesBorins
MylesBorins approved these changes Oct 21, 2020
View changes
Copy link
Member

@MylesBorins MylesBorins left a comment

LGTM

@MylesBorins
Copy link
Member

@MylesBorins MylesBorins commented Oct 21, 2020

Landed in db4ce85

MylesBorins added a commit that referenced this issue Oct 21, 2020
@bdougie @MylesBorins
deps: V8: backport 4263f8a5e8e0
db4ce85 
Original commit message:

    parser: better error message for await+tla

    Bug: v8:9344, v8:6513
    Change-Id: I1854e483515e7da99192367b6764a0ec7c8b41d9
    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2411687
    Reviewed-by: Marja Hölttä <marja@chromium.org>
    Commit-Queue: Gus Caplan <snek@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#70099}

Refs: v8/v8@4263f8a

PR-URL: #35650
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
targos added a commit that referenced this issue Nov 3, 2020
@bdougie @targos
deps: V8: backport 4263f8a5e8e0
894419c 
Original commit message:

    parser: better error message for await+tla

    Bug: v8:9344, v8:6513
    Change-Id: I1854e483515e7da99192367b6764a0ec7c8b41d9
    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2411687
    Reviewed-by: Marja Hölttä <marja@chromium.org>
    Commit-Queue: Gus Caplan <snek@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#70099}

Refs: v8/v8@4263f8a

PR-URL: #35650
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
@targos targos mentioned this pull request Nov 3, 2020
Merged
@targos targos added the dont-land-on-v14.x label Apr 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joyeecheung joyeecheung

@MylesBorins MylesBorins

@Trott Trott

Assignees
No one assigned
Labels
build dont-land-on-v14.x v8 engine
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet
7 participants
@bdougie @nodejs-github-bot @MylesBorins @Trott @codecov-io @joyeecheung @targos