deps: avoid compilation error with ASan

Refs: https://bugs.chromium.org/p/v8/issues/detail?id=14221 PR-URL: nodejs/node#49639 Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
nodejs · Sep 13, 2024 · 76a21aa · 76a21aa
1 parent 18c9d6f
commit 76a21aa
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git 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
@@ -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