Skip to content

Commit 3b66a8d

Browse files
refacktargos
authored andcommitted
deps: fix wrong default for v8 handle zapping
PR-URL: #23801 Fixes: #23796 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Matheus Marchini <mat@mmarchini.me>
1 parent ddd9ccf commit 3b66a8d

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
# Reset this number to 0 on major V8 upgrades.
3535
# Increment by one for each non-official patch applied to deps/v8.
36-
'v8_embedder_string': '-node.5',
36+
'v8_embedder_string': '-node.6',
3737

3838
# Enable disassembler for `--print-code` v8 options
3939
'v8_enable_disassembler': 1,

deps/v8/gypfiles/features.gypi

+7-4
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,9 @@
103103
# Enable mitigations for executing untrusted code.
104104
'v8_untrusted_code_mitigations%': 'true',
105105

106-
'v8_enable_handle_zapping%': 1,
106+
# Currently set for node by common.gypi, avoiding default because of gyp file bug.
107+
# Should be turned on only for debugging.
108+
#'v8_enable_handle_zapping%': 0,
107109
},
108110
'target_defaults': {
109111
'conditions': [
@@ -164,9 +166,10 @@
164166
['v8_untrusted_code_mitigations=="false"', {
165167
'defines': ['DISABLE_UNTRUSTED_CODE_MITIGATIONS',],
166168
}],
167-
['v8_enable_handle_zapping==1', {
168-
'defines': ['ENABLE_HANDLE_ZAPPING',],
169-
}],
169+
# Refs: https://github.com/nodejs/node/pull/23801
170+
# ['v8_enable_handle_zapping==1', {
171+
# 'defines': ['ENABLE_HANDLE_ZAPPING',],
172+
# }],
170173
], # conditions
171174
'defines': [
172175
'V8_GYP_BUILD',

deps/v8/gypfiles/toolchain.gypi

+6
Original file line numberDiff line numberDiff line change
@@ -1321,6 +1321,10 @@
13211321
}, {
13221322
'inherit_from': ['DebugBase1'],
13231323
}],
1324+
# Temporary refs: https://github.com/nodejs/node/pull/23801
1325+
['v8_enable_handle_zapping==1', {
1326+
'defines': ['ENABLE_HANDLE_ZAPPING',],
1327+
}],
13241328
],
13251329
}, # Debug
13261330
'ReleaseBase': {
@@ -1405,6 +1409,8 @@
14051409
}, # Release
14061410
'Release': {
14071411
'inherit_from': ['ReleaseBase'],
1412+
# Temporary refs: https://github.com/nodejs/node/pull/23801
1413+
'defines!': ['ENABLE_HANDLE_ZAPPING',],
14081414
}, # Debug
14091415
'conditions': [
14101416
[ 'OS=="win"', {

0 commit comments

Comments
 (0)