Skip to content

Commit ed029bd

Browse files
committedAug 16, 2024
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: #54077 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
1 parent e600de9 commit ed029bd

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed
 

Diff for: ‎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.2',
39+
'v8_embedder_string': '-node.3',
4040

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

Diff for: ‎deps/v8/src/objects/object-macros.h

+12-12
Original file line numberDiff line numberDiff line change
@@ -696,24 +696,24 @@
696696
#define WRITE_BARRIER(object, offset, value)
697697
#define WRITE_BARRIER_CPP(object, offset, value)
698698
#else
699-
#define WRITE_BARRIER(object, offset, value) \
700-
do { \
701-
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
702-
static_assert(kTaggedCanConvertToRawObjects); \
703-
CombinedWriteBarrier(object, Tagged(object)->RawField(offset), value, \
704-
UPDATE_WRITE_BARRIER); \
699+
#define WRITE_BARRIER(object, offset, value) \
700+
do { \
701+
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
702+
static_assert(kTaggedCanConvertToRawObjects); \
703+
CombinedWriteBarrier(object, (object)->RawField(offset), value, \
704+
UPDATE_WRITE_BARRIER); \
705705
} while (false)
706706
#endif
707707

708708
#ifdef V8_DISABLE_WRITE_BARRIERS
709709
#define WEAK_WRITE_BARRIER(object, offset, value)
710710
#else
711-
#define WEAK_WRITE_BARRIER(object, offset, value) \
712-
do { \
713-
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
714-
static_assert(kTaggedCanConvertToRawObjects); \
715-
CombinedWriteBarrier(object, Tagged(object)->RawMaybeWeakField(offset), \
716-
value, UPDATE_WRITE_BARRIER); \
711+
#define WEAK_WRITE_BARRIER(object, offset, value) \
712+
do { \
713+
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
714+
static_assert(kTaggedCanConvertToRawObjects); \
715+
CombinedWriteBarrier(object, (object)->RawMaybeWeakField(offset), value, \
716+
UPDATE_WRITE_BARRIER); \
717717
} while (false)
718718
#endif
719719

0 commit comments

Comments
 (0)
Please sign in to comment.