From d751952c48325563cbdcd7d263db9ba112f3acc9 Mon Sep 17 00:00:00 2001 From: Michaël Zasso Date: Mon, 21 Oct 2019 15:43:41 +0200 Subject: deps: V8: cherry-pick 3e82c8d MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Commit-Queue: Jakob Gruber Reviewed-by: Jakob Gruber Reviewed-by: Yang Guo 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 Reviewed-By: Jiawen Geng Reviewed-By: Anna Henningsen Reviewed-By: Matteo Collina --- deps/v8/src/codegen/turbo-assembler.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'deps') 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; -- cgit v1.2.3