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

deps: V8: backport d915b8d #27481

Closed
wants to merge 1 commit into from

Conversation

mmarchini
Copy link
Contributor

Original commit message:

[snapshot] Fix copy-IET integration with Code Cache

[email protected], [email protected], [email protected]

Bug: v8:9122
Change-Id: I6336d2fc0249269a749d99dcae7c172b2ccaac75
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1570582
Reviewed-by: Jakob Gruber <[email protected]>
Commit-Queue: Jakob Gruber <[email protected]>
Cr-Commit-Position: refs/heads/master@{#60937}

Refs: v8/v8@d915b8d

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
Copy link
Collaborator

@nodejs-github-bot nodejs-github-bot added build Issues and PRs related to build files or the CI. v8 engine Issues and PRs related to the V8 dependency. labels Apr 29, 2019
@mmarchini
Copy link
Contributor Author

This commit landed upstream last week, so it's not in 7.4 or 7.5. This will fix #27346.

@nodejs-github-bot

This comment has been minimized.

@mmarchini

This comment has been minimized.

deps/v8/test/cctest/cctest.status Show resolved Hide resolved
@targos
Copy link
Member

targos commented Apr 29, 2019

Looks like it needs to be adapted:

19:41:12 ../deps/v8/src/snapshot/code-serializer.cc: In function ‘void v8::internal::CreateInterpreterDataForDeserializedCode(v8::internal::Isolate*, v8::internal::Handle<v8::internal::SharedFunctionInfo>, bool)’:
19:41:12 ../deps/v8/src/snapshot/code-serializer.cc:248:56: error: no matching function for call to ‘v8::internal::Factory::NewStruct(v8::internal::InstanceType, v8::internal::AllocationType)’
19:41:12              INTERPRETER_DATA_TYPE, AllocationType::kOld));
19:41:12                                                         ^
19:41:12 In file included from ../deps/v8/src/isolate.h:27:0,
19:41:12                  from ../deps/v8/src/snapshot/serializer.h:10,
19:41:12                  from ../deps/v8/src/snapshot/code-serializer.h:8,
19:41:12                  from ../deps/v8/src/snapshot/code-serializer.cc:5:
19:41:12 ../deps/v8/src/heap/factory.h:426:18: note: candidate: v8::internal::Handle<v8::internal::Struct> v8::internal::Factory::NewStruct(v8::internal::InstanceType, v8::internal::PretenureFlag)
19:41:12    Handle<Struct> NewStruct(InstanceType type,
19:41:12                   ^~~~~~~~~
19:41:12 ../deps/v8/src/heap/factory.h:426:18: note:   no known conversion for argument 2 from ‘v8::internal::AllocationType’ to ‘v8::internal::PretenureFlag’
19:41:12 tools/v8_gypfiles/v8_base.target.mk:721: recipe for target '/data/iojs/build/workspace/node-test-commit-linuxone/nodes/rhel72-s390x/out/Release/obj.target/v8_base/deps/v8/src/snapshot/code-serializer.o' failed
19:41:12 make[2]: *** [/data/iojs/build/workspace/node-test-commit-linuxone/nodes/rhel72-s390x/out/Release/obj.target/v8_base/deps/v8/src/snapshot/code-serializer.o] Error 1

@mmarchini
Copy link
Contributor Author

Looks like it needs to be adapted

Yep, I'm working on it.

Original commit message:

    [snapshot] Fix copy-IET integration with Code Cache

    [email protected], [email protected], [email protected]

    Bug: v8:9122
    Change-Id: I6336d2fc0249269a749d99dcae7c172b2ccaac75
    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1570582
    Reviewed-by: Jakob Gruber <[email protected]>
    Commit-Queue: Jakob Gruber <[email protected]>
    Cr-Commit-Position: refs/heads/master@{#60937}

Refs: v8/v8@d915b8d
@mmarchini mmarchini force-pushed the v8-backport-d915b8d branch from 2a4e5bf to 8336291 Compare April 29, 2019 18:29
@nodejs-github-bot

This comment has been minimized.

@mmarchini
Copy link
Contributor Author

@nodejs-github-bot

This comment has been minimized.

@nodejs-github-bot
Copy link
Collaborator

@mmarchini mmarchini added author ready PRs that have at least one approval, no pending requests for changes, and a CI started. dont-land-on-v10.x labels Apr 29, 2019
@addaleax
Copy link
Member

I assume V8 7.4 or at least 7.5 is still a supported release line on the V8 side? Should there be a merge request for this?

@mmarchini
Copy link
Contributor Author

Yes, I opened a merge request as well (https://bugs.chromium.org/p/v8/issues/detail?id=9122#c9). Hopefully we won't need to have a floating patch to fix this.

@mmarchini mmarchini added the blocked PRs that are blocked by other issues or PRs. label May 3, 2019
@mmarchini
Copy link
Contributor Author

I think we'll get this merged to 7.4 and 7.5 in the next few days, so blocking this for now.

@mmarchini
Copy link
Contributor Author

Superseded by #27615

@mmarchini mmarchini closed this May 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
author ready PRs that have at least one approval, no pending requests for changes, and a CI started. blocked PRs that are blocked by other issues or PRs. build Issues and PRs related to build files or the CI. v8 engine Issues and PRs related to the V8 dependency.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants