Skip to content

Commit 048c8e4

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 <[email protected]> Reviewed-By: Rafael Gonzaga <[email protected]> Reviewed-By: Antoine du Hamel <[email protected]>
1 parent 3d99879 commit 048c8e4

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

common.gypi

Lines changed: 1 addition & 1 deletion
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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -627,24 +627,24 @@
627627
#define WRITE_BARRIER(object, offset, value)
628628
#define WRITE_BARRIER_CPP(object, offset, value)
629629
#else
630-
#define WRITE_BARRIER(object, offset, value) \
631-
do { \
632-
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
633-
static_assert(kTaggedCanConvertToRawObjects); \
634-
CombinedWriteBarrier(object, Tagged(object)->RawField(offset), value, \
635-
UPDATE_WRITE_BARRIER); \
630+
#define WRITE_BARRIER(object, offset, value) \
631+
do { \
632+
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
633+
static_assert(kTaggedCanConvertToRawObjects); \
634+
CombinedWriteBarrier(object, (object)->RawField(offset), value, \
635+
UPDATE_WRITE_BARRIER); \
636636
} while (false)
637637
#endif
638638

639639
#ifdef V8_DISABLE_WRITE_BARRIERS
640640
#define WEAK_WRITE_BARRIER(object, offset, value)
641641
#else
642-
#define WEAK_WRITE_BARRIER(object, offset, value) \
643-
do { \
644-
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
645-
static_assert(kTaggedCanConvertToRawObjects); \
646-
CombinedWriteBarrier(object, Tagged(object)->RawMaybeWeakField(offset), \
647-
value, UPDATE_WRITE_BARRIER); \
642+
#define WEAK_WRITE_BARRIER(object, offset, value) \
643+
do { \
644+
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
645+
static_assert(kTaggedCanConvertToRawObjects); \
646+
CombinedWriteBarrier(object, (object)->RawMaybeWeakField(offset), value, \
647+
UPDATE_WRITE_BARRIER); \
648648
} while (false)
649649
#endif
650650

0 commit comments

Comments
 (0)