Skip to content

Commit ba4abfd

Browse files
targosMylesBorins
authored andcommitted
deps: V8: cherry-pick 3e82c8d
Original commit message: Fix check for V8_TARGET_OS_WIN macro On Windows with MSVC, the current code triggers a fatal error C1017 (invalid integer constant expression). Change-Id: I41c371a1d7909737052c03c830bb62c41154a192 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1871918 Commit-Queue: Michaël Zasso <[email protected]> Commit-Queue: Jakob Gruber <[email protected]> Reviewed-by: Jakob Gruber <[email protected]> Reviewed-by: Yang Guo <[email protected]> Cr-Commit-Position: refs/heads/master@{#64418} Refs: v8/v8@3e82c8d Backport-PR-URL: #30513 PR-URL: #30020 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Matteo Collina <[email protected]>
1 parent 2abdcbb commit ba4abfd

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

common.gypi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
# Reset this number to 0 on major V8 upgrades.
4141
# Increment by one for each non-official patch applied to deps/v8.
42-
'v8_embedder_string': '-node.9',
42+
'v8_embedder_string': '-node.10',
4343

4444
##### V8 defaults for Node.js #####
4545

deps/v8/src/codegen/turbo-assembler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class V8_EXPORT_PRIVATE TurboAssemblerBase : public Assembler {
102102
static bool IsAddressableThroughRootRegister(
103103
Isolate* isolate, const ExternalReference& reference);
104104

105-
#if V8_TARGET_OS_WIN
105+
#ifdef V8_TARGET_OS_WIN
106106
// Minimum page size. We must touch memory once per page when expanding the
107107
// stack, to avoid access violations.
108108
static constexpr int kStackPageSize = 4 * KB;

0 commit comments

Comments
 (0)