Skip to content

Commit

Permalink
deps: V8: cherry-pick 3e82c8d
Browse files Browse the repository at this point in the history
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 <mic.besace@gmail.com>
    Commit-Queue: Jakob Gruber <jgruber@chromium.org>
    Reviewed-by: Jakob Gruber <jgruber@chromium.org>
    Reviewed-by: Yang Guo <yangguo@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#64418}

Refs: v8/v8@3e82c8d

Backport-PR-URL: #30513
PR-URL: #30020
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
  • Loading branch information
targos authored and MylesBorins committed Nov 21, 2019
1 parent 2abdcbb commit ba4abfd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

# 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.9',
'v8_embedder_string': '-node.10',

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

Expand Down
2 changes: 1 addition & 1 deletion deps/v8/src/codegen/turbo-assembler.h
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class V8_EXPORT_PRIVATE TurboAssemblerBase : public Assembler {
static bool IsAddressableThroughRootRegister(
Isolate* isolate, const ExternalReference& reference);

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

0 comments on commit ba4abfd

Please sign in to comment.