summaryrefslogtreecommitdiff
path: root/deps
diff options
context:
space:
mode:
authorMichaël Zasso <targos@protonmail.com>2019-10-21 15:43:41 +0200
committerMichaël Zasso <targos@protonmail.com>2019-11-08 15:50:50 +0100
commitd751952c48325563cbdcd7d263db9ba112f3acc9 (patch)
treeb8e9b83e761a01c23d0fb7ef1422e6d290110eff /deps
parentf15559a8918edcc001c69e321eb71a6e75cc741c (diff)
downloadandroid-node-v8-d751952c48325563cbdcd7d263db9ba112f3acc9.tar.gz
android-node-v8-d751952c48325563cbdcd7d263db9ba112f3acc9.tar.bz2
android-node-v8-d751952c48325563cbdcd7d263db9ba112f3acc9.zip
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 <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: https://github.com/v8/v8/commit/3e82c8df981b04431877cf8f20d5ba8ae6de22e5 PR-URL: https://github.com/nodejs/node/pull/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>
Diffstat (limited to 'deps')
-rw-r--r--deps/v8/src/codegen/turbo-assembler.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/deps/v8/src/codegen/turbo-assembler.h b/deps/v8/src/codegen/turbo-assembler.h
index c0f833b652..6e11ad5c3f 100644
--- a/deps/v8/src/codegen/turbo-assembler.h
+++ b/deps/v8/src/codegen/turbo-assembler.h
@@ -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;