Commit 3b66a8d
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
3 files changed
Lines changed: 14 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -33,7 +33,7 @@ | |||
| 33 | 33 | ||
| 34 | 34 | # Reset this number to 0 on major V8 upgrades. | |
| 35 | 35 | # Increment by one for each non-official patch applied to deps/v8. | |
| 36 | - 'v8_embedder_string': '-node.5', | ||
| 36 | + 'v8_embedder_string': '-node.6', | ||
| 37 | 37 | ||
| 38 | 38 | # Enable disassembler for `--print-code` v8 options | |
| 39 | 39 | 'v8_enable_disassembler': 1, | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -103,7 +103,9 @@ | |||
| 103 | 103 | # Enable mitigations for executing untrusted code. | |
| 104 | 104 | 'v8_untrusted_code_mitigations%': 'true', | |
| 105 | 105 | ||
| 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, | ||
| 107 | 109 | }, | |
| 108 | 110 | 'target_defaults': { | |
| 109 | 111 | 'conditions': [ | |
@@ -164,9 +166,10 @@ | |||
| 164 | 166 | ['v8_untrusted_code_mitigations=="false"', { | |
| 165 | 167 | 'defines': ['DISABLE_UNTRUSTED_CODE_MITIGATIONS',], | |
| 166 | 168 | }], | |
| 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 | + # }], | ||
| 170 | 173 | ], # conditions | |
| 171 | 174 | 'defines': [ | |
| 172 | 175 | 'V8_GYP_BUILD', | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1321,6 +1321,10 @@ | |||
| 1321 | 1321 | }, { | |
| 1322 | 1322 | 'inherit_from': ['DebugBase1'], | |
| 1323 | 1323 | }], | |
| 1324 | + # Temporary refs: https://github.com/nodejs/node/pull/23801 | ||
| 1325 | + ['v8_enable_handle_zapping==1', { | ||
| 1326 | + 'defines': ['ENABLE_HANDLE_ZAPPING',], | ||
| 1327 | + }], | ||
| 1324 | 1328 | ], | |
| 1325 | 1329 | }, # Debug | |
| 1326 | 1330 | 'ReleaseBase': { | |
@@ -1405,6 +1409,8 @@ | |||
| 1405 | 1409 | }, # Release | |
| 1406 | 1410 | 'Release': { | |
| 1407 | 1411 | 'inherit_from': ['ReleaseBase'], | |
| 1412 | + # Temporary refs: https://github.com/nodejs/node/pull/23801 | ||
| 1413 | + 'defines!': ['ENABLE_HANDLE_ZAPPING',], | ||
| 1408 | 1414 | }, # Debug | |
| 1409 | 1415 | 'conditions': [ | |
| 1410 | 1416 | [ 'OS=="win"', { | |
0 commit comments