Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
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
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .flake8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
[flake8]
exclude=.git,deps,lib,src,test/fixtures,tools/*_macros.py,tools/gyp,tools/inspector_protocol,tools/jinja2,tools/markupsafe,tools/pip,tools/v8_gypfiles/broken
select=E901,E999,F821,F822,F823
3 changes: 1 addition & 2 deletions .gitignore
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
!.editorconfig
!.eslintignore
!.eslintrc.js
!.flake8
!.gitattributes
!.github
!.gitignore
Expand DownExpand Up@@ -123,8 +124,6 @@ deps/uv/docs/src/guide/
# do not override V8's .gitignore
!deps/v8/**
# ignore VS compiler output unhandled by V8's .gitignore
deps/v8/gypfiles/Debug/
deps/v8/gypfiles/Release/
deps/v8/third_party/eu-strip/

.DS_Store
12 changes: 5 additions & 7 deletions Makefile
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,10 +123,10 @@ with-code-cache:
test-code-cache: with-code-cache
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) code-cache

out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp \
deps/zlib/zlib.gyp deps/v8/gypfiles/toolchain.gypi \
deps/v8/gypfiles/features.gypi deps/v8/gypfiles/v8.gyp node.gyp \
config.gypi
out/Makefile: config.gypi common.gypi node.gyp \
deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp \
tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \
tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp
$(PYTHON) tools/gyp_node.py -f make

config.gypi: configure configure.py
Expand DownExpand Up@@ -1305,9 +1305,7 @@ ifneq ("","$(wildcard tools/pip/site-packages)")
# Lints the Python code with flake8.
# Flag the build if there are Python syntax errors or undefined names
lint-py:
PYTHONPATH=tools/pip $(PYTHON) -m flake8 . \
--count --show-source --statistics --select=E901,E999,F821,F822,F823 \
--exclude=.git,deps,lib,src,test/fixtures,tools/*_macros.py,tools/gyp,tools/inspector_protocol,tools/jinja2,tools/markupsafe,tools/pip
PYTHONPATH=tools/pip $(PYTHON) -m flake8 --count --show-source --statistics .
else
lint-py:
@echo "Python linting with flake8 is not avalible"
Expand Down
38 changes: 7 additions & 31 deletions common.gypi
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,12 +37,12 @@

# Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8.
'v8_embedder_string': '-node.7',
'v8_embedder_string': '-node.13',

##### V8 defaults for Node.js #####

# Old time default, now explicitly stated.
'v8_use_snapshot': 'true',
'v8_use_snapshot': 1,

# Turn on SipHash for hash seed generation, addresses HashWick
'v8_use_siphash': 'true',
Expand All@@ -58,21 +58,12 @@
# Enable disassembler for `--print-code` v8 options
'v8_enable_disassembler': 1,

# Don't bake anything extra into the snapshot.
'v8_use_external_startup_data': 0,

# https://github.com/nodejs/node/pull/22920/files#r222779926
'v8_enable_handle_zapping': 0,

# Disable V8 untrusted code mitigations.
# See https://github.com/v8/v8/wiki/Untrusted-code-mitigations
'v8_untrusted_code_mitigations': 'false',

# Still WIP in V8 7.1
'v8_enable_pointer_compression': 'false',

# New in V8 7.1
'v8_enable_embedded_builtins': 'true',
'v8_untrusted_code_mitigations': 0,

# This is more of a V8 dev setting
# https://github.com/nodejs/node/pull/22920/files#r222779926
Expand All@@ -89,39 +80,24 @@
}],
['GENERATOR=="ninja"',{
'obj_dir': '<(PRODUCT_DIR)/obj',
'conditions': [
[ 'build_v8_with_gn=="true"',{
'v8_base': '<(PRODUCT_DIR)/obj/deps/v8/gypfiles/v8_monolith.gen/gn/obj/libv8_monolith.a',
},{
'v8_base': '<(PRODUCT_DIR)/obj/deps/v8/gypfiles/libv8_base.a',
}],
]
'v8_base': '<(PRODUCT_DIR)/obj/tools/v8_gypfiles/libv8_base.a',
},{
'obj_dir%': '<(PRODUCT_DIR)/obj.target',
'v8_base': '<(PRODUCT_DIR)/obj.target/deps/v8/gypfiles/libv8_base.a',
'v8_base': '<(PRODUCT_DIR)/obj.target/tools/v8_gypfiles/libv8_base.a',
}],
['OS == "win"',{
'os_posix': 0,
'v8_postmortem_support%': 'false',
'v8_postmortem_support%': 0,
'obj_dir': '<(PRODUCT_DIR)/obj',
'v8_base': '<(PRODUCT_DIR)/lib/v8_libbase.lib',
},{
'os_posix': 1,
'v8_postmortem_support%': 'true',
'v8_postmortem_support%': 1,
}],
['OS == "mac"',{
'obj_dir%': '<(PRODUCT_DIR)/obj.target',
'v8_base': '<(PRODUCT_DIR)/libv8_base.a',
}],
['build_v8_with_gn == "true"',{
'conditions': [
['GENERATOR == "ninja"',{
'v8_base': '<(PRODUCT_DIR)/obj/deps/v8/gypfiles/v8_monolith.gen/gn/obj/libv8_monolith.a',
},{
'v8_base': '<(PRODUCT_DIR)/obj.target/v8_monolith/geni/gn/obj/libv8_monolith.a',
}],
],
}],
['openssl_fips != ""',{
'openssl_product': '<(STATIC_LIB_PREFIX)crypto<(STATIC_LIB_SUFFIX)',
},{
Expand Down
4 changes: 2 additions & 2 deletions configure.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -1124,8 +1124,8 @@ def configure_v8(o):
o['variables']['v8_optimized_debug'] = 0 if options.v8_non_optimized_debug else 1
o['variables']['v8_random_seed'] = 0 # Use a random seed for hash tables.
o['variables']['v8_promise_internal_field_count'] = 1 # Add internal field to promises for async hooks.
o['variables']['v8_use_snapshot'] = 'false' if options.without_snapshot else 'true'
o['variables']['v8_use_siphash'] = 'false' if options.without_siphash else 'true'
o['variables']['v8_use_siphash'] = 0 if options.without_siphash else 1
o['variables']['v8_use_snapshot'] = 0 if options.without_snapshot else 1
o['variables']['v8_trace_maps'] = 1 if options.trace_maps else 0
o['variables']['node_use_v8_platform'] = b(not options.without_v8_platform)
o['variables']['node_use_bundled_v8'] = b(not options.without_bundled_v8)
Expand Down
1 change: 1 addition & 0 deletions deps/v8/.gitignore
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
*~
.#*
.*.sw?
.ccls-cache
.cpplint-cache
.cproject
.d8_history
Expand Down
3 changes: 3 additions & 0 deletions deps/v8/AUTHORS
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ Andreas Anyuru <[email protected]>
Andrew Paprocki <[email protected]>
Andrei Kashcha <[email protected]>
Anna Henningsen <[email protected]>
Anton Bikineev <[email protected]>
Bangfu Tao <[email protected]>
Daniel Shelton <[email protected]>
Ben Coe <[email protected]>
Expand DownExpand Up@@ -84,6 +85,7 @@ Geoffrey Garside <[email protected]>
Gergely Nagy <[email protected]>
Gus Caplan <[email protected]>
Gwang Yoon Hwang <[email protected]>
Hannu Trey <[email protected]>
Henrique Ferreiro <[email protected]>
Hirofumi Mako <[email protected]>
Honggyu Kim <[email protected]>
Expand DownExpand Up@@ -164,6 +166,7 @@ Tiancheng "Timothy" Gu <[email protected]>
Tobias Burnus <[email protected]>
Tobias Nießen <[email protected]>
Ujjwal Sharma <[email protected]>
Vadim Gorbachev <[email protected]>
Victor Costan <[email protected]>
Vlad Burlik <[email protected]>
Vladimir Krivosheev <[email protected]>
Expand Down
Loading