Skip to content

Commit 785d5cd

Browse files
committed
deps: avoid compilation error with ASan
Refs: https://bugs.chromium.org/p/v8/issues/detail?id=14221 PR-URL: #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: #50115 Reviewed-By: Michael Dawson <midawson@redhat.com>
1 parent 7071c1d commit 785d5cd

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
# Reset this number to 0 on major V8 upgrades.
3838
# Increment by one for each non-official patch applied to deps/v8.
39-
'v8_embedder_string': '-node.3',
39+
'v8_embedder_string': '-node.4',
4040

4141
##### V8 defaults for Node.js #####
4242

deps/v8/src/objects/object-macros.h

+12-12
Original file line numberDiff line numberDiff line change
@@ -580,24 +580,24 @@
580580
#ifdef V8_DISABLE_WRITE_BARRIERS
581581
#define WRITE_BARRIER(object, offset, value)
582582
#else
583-
#define WRITE_BARRIER(object, offset, value) \
584-
do { \
585-
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
586-
static_assert(kTaggedCanConvertToRawObjects); \
587-
CombinedWriteBarrier(object, Tagged(object)->RawField(offset), value, \
588-
UPDATE_WRITE_BARRIER); \
583+
#define WRITE_BARRIER(object, offset, value) \
584+
do { \
585+
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
586+
static_assert(kTaggedCanConvertToRawObjects); \
587+
CombinedWriteBarrier(object, (object)->RawField(offset), value, \
588+
UPDATE_WRITE_BARRIER); \
589589
} while (false)
590590
#endif
591591

592592
#ifdef V8_DISABLE_WRITE_BARRIERS
593593
#define WEAK_WRITE_BARRIER(object, offset, value)
594594
#else
595-
#define WEAK_WRITE_BARRIER(object, offset, value) \
596-
do { \
597-
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
598-
static_assert(kTaggedCanConvertToRawObjects); \
599-
CombinedWriteBarrier(object, Tagged(object)->RawMaybeWeakField(offset), \
600-
value, UPDATE_WRITE_BARRIER); \
595+
#define WEAK_WRITE_BARRIER(object, offset, value) \
596+
do { \
597+
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
598+
static_assert(kTaggedCanConvertToRawObjects); \
599+
CombinedWriteBarrier(object, (object)->RawMaybeWeakField(offset), value, \
600+
UPDATE_WRITE_BARRIER); \
601601
} while (false)
602602
#endif
603603

0 commit comments

Comments
 (0)