-
Notifications
You must be signed in to change notification settings - Fork 28.8k
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
Merge v8 changes #1506
Merge v8 changes #1506
Conversation
Stable is on .14; we should not be on .15 |
4.2.77.15 was the HEAD of branch-heads/4.2 at the time the original PR was merged into next. We're two commits behind, by the way; it's at .17 now. |
I'm sorry; I totally forgot my own instructions for picking which tag to use :(. We should probably grab 17 then... |
This is probably a silly set of questions, but:
|
@chrisdickinson when you find answers perhaps you could document somewhere? either the wiki or in docs/ |
|
Only if there are floating patches. In most cases you can just |
Hm, I'm running into issues doing this:
|
@chrisdickinson I don't think you have to use gclient unless you want to push stuff back. Cloning the git repo, retrieving commits between known states (current tag vs intended next tag) and go through floating patches to see if they've been merged or interferes with applying the new commits could be enough. |
@jbergstroem Cool – the other problem is that I don't see any refs (tags or branches) corresponding to |
@chrisdickinson to see the branch-heads you need to edit the .git/config file as per instructions from @domenic https://gist.github.com/domenic/aca7774a5d94156bfcc1#checking-out-the-head-of-the-corresponding-branch |
@ofrobots Thanks for the link. I'll pull this into a document in |
This commit applies some secondary changes in order to make `make test` pass cleanly: * disable broken postmortem debugging in common.gypi * drop obsolete strict mode test in parallel/test-repl * drop obsolete test parallel/test-v8-features PR-URL: #1232 Reviewed-By: Fedor Indutny <fedor@indutny.com>
Cherry-pick https://codereview.chromium.org/1033733003 from upstream and re-enable postmortem debugging. PR-URL: #1232 Reviewed-By: Fedor Indutny <fedor@indutny.com>
To update: I'm seeing errors on tests now that I've merged in V8 4.2.77.18, specifically:
|
Ok, tracked down the error. It turns out I hadn't pulled in @indutny's |
@chrisdickinson wut? was it fixed by re-introducing SealHandleScope? |
@indutny When grabbing the new V8 tree, I checked out branch-heads/4.2, which did not have v8's 1f8555 on them. When I tried to compile, it was missing SealHandleScope. I erroneously reintroduced that class def + implementation manually and recompiled. It seemed to work, until I ran tests at which point the above error started spamming out. Running a debug build did not have the same errors. I looked at a5244d3 and noticed the link to 1f8555. I cherry-picked that commit onto my v8 working tree, then vendored that into iojs and recompiled, and the tests passed. Specifically, I had missed these changes. |
let's get this show on the road folks! |
Branch head is up to 18, would be good to update this PR to just be a clean upgrade to 18 + any floating patches. |
Yep, this is updated to 18.
|
@domenic Ah – did you mean that the upgrade commits should be squashed down to a single commit? I'll do that on merge. Until then I'm leaving the commits I introduced (3d57c7b and a1b16ca) separate so @indutny and @bnoordhuis can review them. |
LGTM but it would be easier if you split off the out-of-tree patches into separate commits. You seem to be doing that for the postmortem fixes but not SealHandleScope. |
Ah the commit log typo is what confused me. Also the additional tmpdir() commit. |
This commit applies a secondary change in order to make `make test` pass cleanly, specifically re-disabling post-mortem debugging in common.gypi.
Cherry-pick https://codereview.chromium.org/1033733003 from upstream and re-enable postmortem debugging. PR-URL: #1232 Reviewed-By: Fedor Indutny <fedor@indutny.com>
Ah, updated the commit log, sorry about that. @bnoordhuis: Ah, my goal in partitioning the history they way I did was to make sure that each commit compiled & passed the tests – for the future, I'll leave them separate. Also, I'm working on documenting the process over here and will PR that soon. |
This commit applies a secondary change in order to make `make test` pass cleanly, specifically re-disabling post-mortem debugging in common.gypi. PR-URL: #1506 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Merged in 509b59e. Ended up leaving the commits separate. |
This cherry-picks the commits from next to master.
The cherry-picked commits are:
767a5c6
41c00a2
336dc08
bb97b70
There was one conflict involving deps/v8/AUTHORS and deps/v8/v8_version.h. I changed both to match
next
.