From 605990f71fe992b282c9b0026b4ca05bba654ca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Mon, 31 Jul 2023 11:51:27 +0200 Subject: [PATCH] deps: avoid compilation error with ASan Refs: https://bugs.chromium.org/p/v8/issues/detail?id=14221 PR-URL: https://github.com/nodejs/node/pull/49639 Reviewed-By: Jiawen Geng Reviewed-By: Rafael Gonzaga Reviewed-By: Antoine du Hamel --- common.gypi | 2 +- deps/v8/src/objects/object-macros.h | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/common.gypi b/common.gypi index 718b9dc24fd..b5e4ea18728 100644 --- a/common.gypi +++ b/common.gypi @@ -36,7 +36,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.2', + 'v8_embedder_string': '-node.3', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/src/objects/object-macros.h b/deps/v8/src/objects/object-macros.h index 41757eb9b2f..d1102c9365e 100644 --- a/deps/v8/src/objects/object-macros.h +++ b/deps/v8/src/objects/object-macros.h @@ -707,24 +707,24 @@ #define WRITE_BARRIER(object, offset, value) #define WRITE_BARRIER_CPP(object, offset, value) #else -#define WRITE_BARRIER(object, offset, value) \ - do { \ - DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \ - static_assert(kTaggedCanConvertToRawObjects); \ - CombinedWriteBarrier(object, Tagged(object)->RawField(offset), value, \ - UPDATE_WRITE_BARRIER); \ +#define WRITE_BARRIER(object, offset, value) \ + do { \ + DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \ + static_assert(kTaggedCanConvertToRawObjects); \ + CombinedWriteBarrier(object, (object)->RawField(offset), value, \ + UPDATE_WRITE_BARRIER); \ } while (false) #endif #ifdef V8_DISABLE_WRITE_BARRIERS #define WEAK_WRITE_BARRIER(object, offset, value) #else -#define WEAK_WRITE_BARRIER(object, offset, value) \ - do { \ - DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \ - static_assert(kTaggedCanConvertToRawObjects); \ - CombinedWriteBarrier(object, Tagged(object)->RawMaybeWeakField(offset), \ - value, UPDATE_WRITE_BARRIER); \ +#define WEAK_WRITE_BARRIER(object, offset, value) \ + do { \ + DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \ + static_assert(kTaggedCanConvertToRawObjects); \ + CombinedWriteBarrier(object, (object)->RawMaybeWeakField(offset), value, \ + UPDATE_WRITE_BARRIER); \ } while (false) #endif