Skip to content

Commit f429b98

Browse files
refacknodejs-ci
authored andcommitted
deps: V8 sync gypfiles with 7.1
enable v8_enable_embedded_builtins reorder conditions proccessing for `run_mksnapshot`
1 parent 93e8a17 commit f429b98

File tree

5 files changed

+286
-144
lines changed

5 files changed

+286
-144
lines changed

common.gypi

+35-8
Original file line numberDiff line numberDiff line change
@@ -28,29 +28,56 @@
2828

2929
'openssl_fips%': '',
3030

31-
# Default to -O0 for debug builds.
32-
'v8_optimized_debug%': 0,
31+
# Some STL containers (e.g. std::vector) do not preserve ABI compatibility
32+
# between debug and non-debug mode.
33+
'disable_glibcxx_debug': 1,
34+
35+
# Don't use ICU data file (icudtl.dat) from V8, we use our own.
36+
'icu_use_data_file_flag%': 0,
3337

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

42+
##### V8 defaults for Node.js #####
43+
44+
# Old time default, now explicitly stated.
45+
'v8_use_snapshot': 'true',
46+
47+
# Refs: https://github.com/nodejs/node/issues/23122
48+
# Refs: https://github.com/nodejs/node/issues/23167
49+
# Enable compiler warnings when using V8_DEPRECATED apis.
50+
'v8_deprecation_warnings': 1,
51+
# Enable compiler warnings when using V8_DEPRECATE_SOON apis.
52+
'v8_imminent_deprecation_warnings': 1,
53+
54+
# Default to -O0 for debug builds.
55+
'v8_optimized_debug': 0,
56+
3857
# Enable disassembler for `--print-code` v8 options
3958
'v8_enable_disassembler': 1,
4059

4160
# Don't bake anything extra into the snapshot.
42-
'v8_use_external_startup_data%': 0,
61+
'v8_use_external_startup_data': 0,
62+
63+
# https://github.com/nodejs/node/pull/22920/files#r222779926
64+
'v8_enable_handle_zapping': 0,
4365

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

48-
# Some STL containers (e.g. std::vector) do not preserve ABI compatibility
49-
# between debug and non-debug mode.
50-
'disable_glibcxx_debug': 1,
70+
# Still WIP in V8 7.1
71+
'v8_enable_pointer_compression': 'false',
5172

52-
# Don't use ICU data file (icudtl.dat) from V8, we use our own.
53-
'icu_use_data_file_flag%': 0,
73+
# New in V8 7.1
74+
'v8_enable_embedded_builtins': 'true',
75+
76+
# This is more of a V8 dev setting
77+
# https://github.com/nodejs/node/pull/22920/files#r222779926
78+
'v8_enable_fast_mksnapshot': 0,
79+
80+
##### end V8 defaults #####
5481

5582
'conditions': [
5683
['GENERATOR=="ninja"', {

deps/v8/gypfiles/features.gypi

+27
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,25 @@
104104
'v8_untrusted_code_mitigations%': 'true',
105105

106106
'v8_enable_handle_zapping%': 1,
107+
108+
'v8_enable_pointer_compression%': 'false',
109+
110+
'v8_enable_embedded_builtins%': 'true',
111+
112+
'v8_perf_prof_unwinding_info%': 0,
113+
114+
'v8_enable_fast_mksnapshot%': 0,
107115
},
116+
117+
'conditions': [
118+
# V8's predicate inverted since we default to 'true' and set 'false' for unsupported cases.
119+
# v8_use_snapshot && v8_current_cpu != "x86" && !is_aix && ( !is_win || is_clang)
120+
['not (v8_use_snapshot=="true" and v8_target_arch !="ia32" and OS!="aix" and (OS!="win" or clang==1))', {
121+
'variables': {
122+
'v8_enable_embedded_builtins': 'false',
123+
}
124+
}],
125+
],
108126
'target_defaults': {
109127
'conditions': [
110128
['v8_embedder_string!=""', {
@@ -167,6 +185,15 @@
167185
['v8_enable_handle_zapping==1', {
168186
'defines': ['ENABLE_HANDLE_ZAPPING',],
169187
}],
188+
['v8_enable_pointer_compression=="true"', {
189+
'defines': ['V8_COMPRESS_POINTERS',],
190+
}],
191+
['v8_enable_embedded_builtins=="true"', {
192+
'defines': [
193+
'V8_EMBEDDED_BUILTINS',
194+
'V8_EMBEDDED_BYTECODE_HANDLERS',
195+
],
196+
}],
170197
], # conditions
171198
'defines': [
172199
'V8_GYP_BUILD',

deps/v8/gypfiles/v8-monolithic.gyp

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
'v8_code': 1,
88
'v8_random_seed%': 314159265,
99
'v8_vector_stores%': 0,
10-
'embed_script%': "",
11-
'warmup_script%': "",
10+
'v8_embed_script%': "",
1211
'v8_extra_library_files%': [],
1312
'v8_experimental_extra_library_files%': [],
1413
'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',

0 commit comments

Comments
 (0)