summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-07-09 15:15:23 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-07-09 14:04:33 +0000
commitbe2f3bb839aab9ad8ba7b545b8a2bc91ce6702d4 (patch)
tree9dacb09db3022b79fc3b0aa5415a3eab6ecc44ef
parentac8c89fee80284274d2be5318fe9cf76f2e2cba9 (diff)
downloadqtwebengine-chromium-be2f3bb839aab9ad8ba7b545b8a2bc91ce6702d4.tar.gz
FIXUP: Fixup of Windows build post 75-merge
Only wider in MSVC debug ABI. Change-Id: Ic733442e88a60c0d64933b7d61190fbae69f1b33 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
-rw-r--r--chromium/v8/src/heap/heap-write-barrier-inl.h2
-rw-r--r--chromium/v8/src/heap/spaces.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/chromium/v8/src/heap/heap-write-barrier-inl.h b/chromium/v8/src/heap/heap-write-barrier-inl.h
index ba7d4decc4f..388d7e19ee4 100644
--- a/chromium/v8/src/heap/heap-write-barrier-inl.h
+++ b/chromium/v8/src/heap/heap-write-barrier-inl.h
@@ -53,7 +53,7 @@ V8_EXPORT_PRIVATE void Heap_MarkingBarrierForDescriptorArraySlow(
namespace heap_internals {
struct Space {
-#if V8_CC_MSVC
+#if V8_CC_MSVC && !defined(NDEBUG)
static constexpr uintptr_t kIdOffset = 10 * kSystemPointerSize;
#else
static constexpr uintptr_t kIdOffset = 9 * kSystemPointerSize;
diff --git a/chromium/v8/src/heap/spaces.h b/chromium/v8/src/heap/spaces.h
index 5ab3eebc20d..e6ac190f14c 100644
--- a/chromium/v8/src/heap/spaces.h
+++ b/chromium/v8/src/heap/spaces.h
@@ -1099,7 +1099,7 @@ class V8_EXPORT_PRIVATE Space : public Malloced {
std::atomic<size_t>* external_backing_store_bytes_;
private:
-#if V8_CC_MSVC
+#if V8_CC_MSVC && !defined(NDEBUG)
static const intptr_t kIdOffset = 10 * kSystemPointerSize;
#else
static const intptr_t kIdOffset = 9 * kSystemPointerSize;