From e96542f2c6a822e3abe116aef93c4e51e75063ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= <targos@protonmail.com>
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 <technicalcute@gmail.com>
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/52293
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Richard Lau <rlau@redhat.com>
---
 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 41506421d0..b7238f3d3e 100644
--- a/common.gypi
+++ b/common.gypi
@@ -37,7 +37,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.3',
+    'v8_embedder_string': '-node.4',
 
     ##### V8 defaults for Node.js #####
 
diff --git a/deps/v8/src/objects/object-macros.h b/deps/v8/src/objects/object-macros.h
index baec683eb7..9b5cb9f09e 100644
--- a/deps/v8/src/objects/object-macros.h
+++ b/deps/v8/src/objects/object-macros.h
@@ -671,24 +671,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