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.9.255.9 #45

Merged
merged 3 commits into from
Mar 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
40 changes: 38 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@ project(V8 LANGUAGES CXX C ASM)

if(MSVC)
enable_language(ASM_MASM)
set_property(SOURCE ${PROJECT_BINARY_DIR}/embedded.S PROPERTY LANGUAGE ASM_MASM)
set_property(
SOURCE ${PROJECT_BINARY_DIR}/embedded.S
v8/src/heap/base/asm/arm64/push_registers_masm.S
v8/src/heap/base/asm/ia32/push_registers_masm.S
v8/src/heap/base/asm/x64/push_registers_masm.S
PROPERTY LANGUAGE ASM_MASM)

endif()

list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
Expand Down Expand Up @@ -190,16 +196,43 @@ file(GLOB zone-sources RELATIVE ${PROJECT_SOURCE_DIR} CONFIGURE_DEPENDS v8/src/z
file(GLOB heap-sources RELATIVE ${PROJECT_SOURCE_DIR} CONFIGURE_DEPENDS
v8/src/heap/*.cc
v8/src/heap/base/*.cc
v8/src/heap/cppgc-js/*.cc
v8/src/heap/cppgc/*.cc
v8/src/heap/third-party/*.cc
)

# Caged heap feature is x64/arm64-only at the moment.
list(REMOVE_ITEM heap-sources
v8/src/heap/conservative-stack-visitor.cc
v8/src/heap/cppgc/caged-heap-local-data.cc
v8/src/heap/cppgc/caged-heap.cc
)

if(WIN32)
list(APPEND heap-sources
$<${is-arm64}:v8/src/heap/base/asm/arm64/push_registers_masm.S>
$<${is-ia32}:v8/src/heap/base/asm/ia32/push_registers_masm.S>
$<${is-x64}:v8/src/heap/base/asm/x64/push_registers_masm.S>
)
else()
list(APPEND heap-sources
$<${is-arm64}:v8/src/heap/base/asm/arm64/push_registers_asm.cc>
$<${is-arm}:v8/src/heap/base/asm/arm/push_registers_asm.cc>
$<${is-ia32}:v8/src/heap/base/asm/ia32/push_registers_asm.cc>
$<${is-mips64}:v8/src/heap/base/asm/mips64/push_registers_asm.cc>
$<${is-mips}:v8/src/heap/base/asm/mips/push_registers_asm.cc>
$<${is-ppc}:v8/src/heap/base/asm/ppc/push_registers_asm.cc>
$<${is-s390}:v8/src/heap/base/asm/s390/push_registers_asm.cc>
$<${is-x64}:v8/src/heap/base/asm/x64/push_registers_asm.cc>
)
endif()

list(REMOVE_ITEM builtin-sources
v8/src/builtins/builtins-intl-gen.cc
v8/src/builtins/builtins-intl.cc
)

list(REMOVE_ITEM diagnostic-sources v8/src/diagnostics/unwinding-info-win64.cc)
list(REMOVE_ITEM heap-sources v8/src/heap/conservative-stack-visitor.cc)
list(REMOVE_ITEM object-sources ${i18n-sources})
list(REMOVE_ITEM regexp-sources v8/src/regexp/gen-regexp-special-case.cc)
list(REMOVE_ITEM runtime-sources v8/src/runtime/runtime-intl.cc)
Expand Down Expand Up @@ -278,6 +311,7 @@ add_library(v8_base_without_compiler STATIC
${snapshot-sources}
${strings-sources}
v8/src/tasks/cancelable-task.cc
v8/src/tasks/operations-barrier.cc
v8/src/tasks/task-utils.cc
v8/src/third_party/siphash/halfsiphash.cc
v8/src/tracing/trace-event.cc
Expand Down Expand Up @@ -583,6 +617,8 @@ add_custom_command(
add_library(v8_libplatform STATIC)
target_sources(v8_libplatform
PRIVATE
$<$<NOT:${is-win}>:v8/src/libplatform/tracing/recorder-default.cc>
$<${is-win}:v8/src/libplatform/tracing/recorder-win.cc>
v8/src/libplatform/default-foreground-task-runner.cc
v8/src/libplatform/default-job.cc
v8/src/libplatform/default-platform.cc
Expand Down
29 changes: 29 additions & 0 deletions patches/0003-Back-port-v8-v8-a113954.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
From a7aa63aedec96919ffa1124c3846259ac4b606ea Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <[email protected]>
Date: Sun, 28 Feb 2021 15:02:57 +0100
Subject: [PATCH] Back-port v8/v8@a113954

Original commit message:

Fixes compilation with msvc 2019 toolchain.
---
v8/include/v8-cppgc.h | 3 +++
1 file changed, 3 insertions(+)

diff --git a/v8/include/v8-cppgc.h b/v8/include/v8-cppgc.h
index 8a0d9cb9..5a3712dd 100644
--- a/v8/include/v8-cppgc.h
+++ b/v8/include/v8-cppgc.h
@@ -26,6 +26,9 @@ class CppHeap;
} // namespace internal

struct V8_EXPORT CppHeapCreateParams {
+ CppHeapCreateParams(const CppHeapCreateParams&) = delete;
+ CppHeapCreateParams& operator=(const CppHeapCreateParams&) = delete;
+
std::vector<std::unique_ptr<cppgc::CustomSpaceBase>> custom_spaces;
};

--
2.25.1

10 changes: 5 additions & 5 deletions update_v8.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
[
{
"url": "https://chromium.googlesource.com/v8/v8.git",
"commit": "e71858f7a080b9bd813876c13be4ce30d993d1d9",
"commit": "6fbcc11c530bb348e805f6c5cfcd15c337640dc8",
"/* comment */": "Dependency v8 must be first.",
"branch": "branch-heads/8.8",
"branch": "branch-heads/8.9",
"path": ""
},
{
"url": "https://chromium.googlesource.com/external/github.com/google/googletest.git",
"commit": "4fe018038f87675c083d0cfb6a6b57c274fb1753",
"commit": "1b0cdaae57c046c87fb99cb4f69c312a7e794adb",
"branch": "master",
"path": "third_party/googletest/src"
},
{
"url": "https://chromium.googlesource.com/chromium/src/third_party/jinja2.git",
"commit": "a82a4944a7f2496639f34a89c9923be5908b80aa",
"commit": "11b6b3e5971d760bd2d310f77643f55a818a6d25",
"branch": "master",
"path": "third_party/jinja2"
},
Expand All @@ -26,7 +26,7 @@
},
{
"url": "https://chromium.googlesource.com/chromium/src/third_party/zlib.git",
"commit": "e84c9a3fd75fdc39055b7ae27d6ec508e50bd39e",
"commit": "2c183c9f93a328bfb3121284da13cf89a0f7e64a",
"branch": "master",
"path": "third_party/zlib"
},
Expand Down
13 changes: 13 additions & 0 deletions v8/.github/mistaken-pull-closer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# `true` will close all PRs.
filters:
- true

# The message to post to the closed PR.
commentBody: |
Thanks for your contribution! Unfortunately, we don't use GitHub pull
requests to manage code contributions to this repository. Instead, please
see https://v8.dev/docs/contribute which provides full instructions on
how to get involved.

# Whether to add a label to the closed PR.
addLabel: false
3 changes: 2 additions & 1 deletion v8/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
*~
.#*
.*.sw?
.cache
.ccls-cache
.clangd
.cpplint-cache
Expand Down Expand Up @@ -61,7 +62,6 @@
/test/wasm-spec-tests/tests.tar.gz
/third_party/*
!/third_party/antlr4
!/third_party/binutils
!/third_party/inspector_protocol
!/third_party/jsoncpp
/third_party/jsoncpp/source
Expand All @@ -72,6 +72,7 @@
!/third_party/v8
!/third_party/wasm-api
/tools/clang
/tools/gcmole/bootstrap
/tools/gcmole/gcmole-tools
/tools/gcmole/gcmole-tools.tar.gz
/tools/jsfunfuzz/jsfunfuzz
Expand Down
2 changes: 1 addition & 1 deletion v8/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ IBM Inc. <*@ibm.com>
Red Hat Inc. <*@redhat.com>
Samsung <*@*.samsung.com>
Samsung <*@samsung.com>
Joyent, Inc <*@joyent.com>
RT-RK Computer Based System <*@rt-rk.com>
Amazon, Inc <*@amazon.com>
ST Microelectronics <*@st.com>
Expand Down Expand Up @@ -135,6 +134,7 @@ Kevin Gibbons <[email protected]>
Kris Selden <[email protected]>
Kyounga Ra <[email protected]>
Loo Rong Jie <[email protected]>
Lu Yahan <[email protected]>
Luis Reis <[email protected]>
Luke Zarko <[email protected]>
Maciej Małecki <[email protected]>
Expand Down
Loading