Skip to content

Commit

Permalink
Merge branch 'master' into feat/cpp20
Browse files Browse the repository at this point in the history
  • Loading branch information
gengjiawen authored Mar 26, 2024
2 parents 1448629 + bc3893c commit 5c86a29
Show file tree
Hide file tree
Showing 1,033 changed files with 46,171 additions and 23,786 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: setup
run: cmake -E make_directory ${{runner.workspace}}/build
run: |
git config --global core.longpaths true
cmake -E make_directory ${{runner.workspace}}/build
- name: configure
run: cmake ${{runner.workspace}}/v8-cmake
working-directory: ${{runner.workspace}}/build
Expand Down
9 changes: 8 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -999,14 +999,20 @@ target_include_directories(v8_torque_generated
${PROJECT_SOURCE_DIR}/v8
)

# The torque-outputs and torque_outputs variables can have too many characters
# on Windows to be executed on the command line, so we have to write it to a
# temporary file and execute that
file(WRITE "${PROJECT_BINARY_DIR}/touch_torque_outputs.cmake"
"file(TOUCH ${torque-outputs};${torque_outputs})")

add_custom_command(
COMMAND
torque
-o ${PROJECT_BINARY_DIR}/torque-generated
-v8-root ${PROJECT_SOURCE_DIR}/v8
${torque_files}
COMMAND
${CMAKE_COMMAND} -E touch ${torque-outputs} ${torque_outputs}
${CMAKE_COMMAND} -P ${PROJECT_BINARY_DIR}/touch_torque_outputs.cmake
DEPENDS
torque
${torque_dirs}
Expand All @@ -1016,6 +1022,7 @@ add_custom_command(
${torque_outputs}
)


add_custom_command(
COMMAND
${CMAKE_COMMAND} -E make_directory ${torque_dirs}
Expand Down
6 changes: 3 additions & 3 deletions update_v8.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[
{
"url": "https://chromium.googlesource.com/v8/v8.git",
"commit": "07c05c4b8c5e8916e604c09692d7b6e1813c606e",
"commit": "3236505a90c64a5fbb1e1f2584b9e551d84a08dc",
"/* comment */": "Dependency v8 must be first.",
"branch": "branch-heads/11.5",
"branch": "branch-heads/11.6",
"path": ""
},
{
Expand All @@ -26,7 +26,7 @@
},
{
"url": "https://chromium.googlesource.com/chromium/src/third_party/zlib.git",
"commit": "14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f",
"commit": "e6795474e4885ae55b6c6c0a612d0889e2ebd8d9",
"branch": "master",
"path": "third_party/zlib"
},
Expand Down
2 changes: 1 addition & 1 deletion update_v8.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def update_all():
# Now for some arbitrary code execution...
what = '{}:DEPS'.format(v8['commit'])
source = git('show', what, check_output=True, cwd=repodir(v8))
code = compile('def Var(k): return vars[k]\n' + source, 'DEPS', 'exec')
code = compile('def Var(k): return vars[k]\ndef Str(k): return str(k)\n' + source, 'DEPS', 'exec')
globls = {}
eval(code, globls)
v8_deps = globls['deps']
Expand Down
2 changes: 2 additions & 0 deletions v8/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@
/test/wasm-spec-tests/tests.tar.gz
/third_party/*
!/third_party/antlr4
!/third_party/cpu_features
/third_party/cpu_features/src
!/third_party/inspector_protocol
!/third_party/jsoncpp
/third_party/jsoncpp/source
Expand Down
21 changes: 19 additions & 2 deletions v8/.vpython3
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,24 @@ wheel: <
version: "version:3.19.3"
>

# requests and its dependencies.
wheel: <
name: "infra/python/wheels/requests-py2_py3"
version: "version:2.13.0"
name: "infra/python/wheels/requests-py3"
version: "version:2.31.0"
>
wheel: <
name: "infra/python/wheels/urllib3-py2_py3"
version: "version:1.26.6"
>
wheel: <
name: "infra/python/wheels/idna-py2_py3"
version: "version:2.8"
>
wheel: <
name: "infra/python/wheels/certifi-py2_py3"
version: "version:2020.11.8"
>
wheel: <
name: "infra/python/wheels/charset_normalizer-py3"
version: "version:2.0.4"
>
2 changes: 2 additions & 0 deletions v8/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ Maciej Małecki <[email protected]>
Marcel Laverdet <[email protected]>
Marcin Cieślak <[email protected]>
Marcin Wiącek <[email protected]>
Marisa Kirisame <[email protected]>
Martin Bidlingmaier <[email protected]>
Mateusz Czeladka <[email protected]>
Matheus Marchini <[email protected]>
Expand Down Expand Up @@ -241,6 +242,7 @@ Sakthipriyan Vairamani (thefourtheye) <[email protected]>
Sander Mathijs van Veen <[email protected]>
Sandro Santilli <[email protected]>
Sanjoy Das <[email protected]>
Sam James <[email protected]>
Seo Sanghyeon <[email protected]>
Shawn Anastasio <[email protected]>
Shawn Presser <[email protected]>
Expand Down
33 changes: 31 additions & 2 deletions v8/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ load(":bazel/v8-non-pointer-compression.bzl", "v8_binary_non_pointer_compression
# v8_use_mips_abi_hardfloat
# v8_enable_gdbjit
# v8_check_header_includes
# v8_enable_shared_ro_heap
# v8_enable_lazy_source_positions
# v8_enable_third_party_heap
# v8_third_party_heap_files
Expand Down Expand Up @@ -228,6 +227,13 @@ v8_flag(
default = True,
)

# Shared RO heap. Flag has to be set to false when
# v8_enable_pointer_compression_shared_cage is set to false.
v8_flag(
name = "v8_enable_shared_ro_heap",
default = True,
)

# Enable shared cage if v8_enable_pointer_compression
# and v8_enable_pointer_compression_shared_cage.
selects.config_setting_group(
Expand Down Expand Up @@ -413,6 +419,10 @@ v8_config(
"V8_COMPRESS_POINTERS_IN_ISOLATE_CAGE",
],
"//conditions:default": [],
}) + select({
":is_v8_enable_shared_ro_heap": [
"V8_SHARED_RO_HEAP",
],
}) + select({
":is_v8_enable_short_builtin_calls": [
"V8_SHORT_BUILTIN_CALLS",
Expand Down Expand Up @@ -843,10 +853,12 @@ filegroup(
"src/builtins/iterator.tq",
"src/builtins/iterator-from.tq",
"src/builtins/iterator-helpers.tq",
"src/builtins/map-groupby.tq",
"src/builtins/math.tq",
"src/builtins/number.tq",
"src/builtins/object.tq",
"src/builtins/object-fromentries.tq",
"src/builtins/object-groupby.tq",
"src/builtins/promise-abstract-operations.tq",
"src/builtins/promise-all.tq",
"src/builtins/promise-all-element-closure.tq",
Expand Down Expand Up @@ -881,6 +893,8 @@ filegroup(
"src/builtins/regexp-source.tq",
"src/builtins/regexp-split.tq",
"src/builtins/regexp-test.tq",
"src/builtins/set-intersection.tq",
"src/builtins/set-union.tq",
"src/builtins/string-at.tq",
"src/builtins/string-endswith.tq",
"src/builtins/string-html.tq",
Expand Down Expand Up @@ -999,6 +1013,7 @@ filegroup(
"third_party/v8/builtins/array-sort.tq",
] + select({
":is_v8_enable_webassembly": [
"src/builtins/js-to-wasm.tq",
"src/builtins/wasm.tq",
"src/debug/debug-wasm-objects.tq",
"src/wasm/wasm-objects.tq",
Expand Down Expand Up @@ -1550,6 +1565,8 @@ filegroup(
"src/heap/marking-worklist-inl.h",
"src/heap/memory-allocator.cc",
"src/heap/memory-allocator.h",
"src/heap/memory-balancer.cc",
"src/heap/memory-balancer.h",
"src/heap/memory-chunk.cc",
"src/heap/memory-chunk.h",
"src/heap/memory-chunk-inl.h",
Expand All @@ -1575,6 +1592,7 @@ filegroup(
"src/heap/paged-spaces.h",
"src/heap/paged-spaces-inl.h",
"src/heap/parallel-work-item.h",
"src/heap/parked-scope-inl.h",
"src/heap/parked-scope.h",
"src/heap/pretenuring-handler.cc",
"src/heap/pretenuring-handler.h",
Expand Down Expand Up @@ -1954,6 +1972,7 @@ filegroup(
"src/objects/synthetic-module.cc",
"src/objects/synthetic-module.h",
"src/objects/synthetic-module-inl.h",
"src/objects/tagged.h",
"src/objects/tagged-field.h",
"src/objects/tagged-field-inl.h",
"src/objects/tagged-impl.cc",
Expand Down Expand Up @@ -2134,6 +2153,11 @@ filegroup(
"src/sandbox/external-pointer-table.cc",
"src/sandbox/external-pointer-table.h",
"src/sandbox/external-pointer-table-inl.h",
"src/sandbox/code-pointer-table.cc",
"src/sandbox/code-pointer-table.h",
"src/sandbox/code-pointer-table-inl.h",
"src/sandbox/code-pointer.h",
"src/sandbox/code-pointer-inl.h",
"src/sandbox/external-entity-table.h",
"src/sandbox/external-entity-table-inl.h",
"src/sandbox/sandbox.cc",
Expand Down Expand Up @@ -2162,6 +2186,7 @@ filegroup(
"src/snapshot/read-only-deserializer.h",
"src/snapshot/read-only-serializer.cc",
"src/snapshot/read-only-serializer.h",
"src/snapshot/read-only-serializer-deserializer.h",
"src/snapshot/references.h",
"src/snapshot/roots-serializer.cc",
"src/snapshot/roots-serializer.h",
Expand Down Expand Up @@ -2799,6 +2824,7 @@ filegroup(
"src/compiler/js-graph.h",
"src/compiler/js-heap-broker.cc",
"src/compiler/js-heap-broker.h",
"src/compiler/js-heap-broker-inl.h",
"src/compiler/js-inlining.cc",
"src/compiler/js-inlining.h",
"src/compiler/js-inlining-heuristic.cc",
Expand Down Expand Up @@ -2969,7 +2995,6 @@ filegroup(
"src/compiler/turboshaft/store-store-elimination-phase.h",
"src/compiler/turboshaft/store-store-elimination-reducer.h",
"src/compiler/turboshaft/structural-optimization-reducer.h",
"src/compiler/turboshaft/tag-untag-lowering-reducer.h",
"src/compiler/turboshaft/tracing.h",
"src/compiler/turboshaft/type-assertions-phase.cc",
"src/compiler/turboshaft/type-assertions-phase.h",
Expand All @@ -2990,6 +3015,7 @@ filegroup(
"src/compiler/turboshaft/utils.h",
"src/compiler/turboshaft/value-numbering-reducer.h",
"src/compiler/turboshaft/variable-reducer.h",
"src/compiler/turboshaft/wasm-js-lowering-reducer.h",
"src/compiler/type-cache.cc",
"src/compiler/type-cache.h",
"src/compiler/type-narrowing-reducer.cc",
Expand Down Expand Up @@ -3088,6 +3114,8 @@ filegroup(
"src/compiler/wasm-load-elimination.h",
"src/compiler/wasm-loop-peeling.cc",
"src/compiler/wasm-loop-peeling.h",
"src/compiler/wasm-js-lowering.cc",
"src/compiler/wasm-js-lowering.h",
"src/compiler/wasm-typer.cc",
"src/compiler/wasm-typer.h",
],
Expand Down Expand Up @@ -3600,6 +3628,7 @@ py_binary(
"third_party/inspector_protocol/templates/TypeBuilder_cpp.template",
"third_party/inspector_protocol/templates/TypeBuilder_h.template",
],
imports = ["third_party/inspector_protocol/"],
python_version = "PY3",
deps = [
requirement("jinja2"),
Expand Down
Loading

0 comments on commit 5c86a29

Please sign in to comment.