Skip to content

Commit d2c84c9

Browse files
targosRafaelGSS
authored andcommitted
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]> PR-URL: #52465 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Michael Dawson <[email protected]>
1 parent 95d6045 commit d2c84c9

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
@@ -37,7 +37,7 @@
3737

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

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

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -697,24 +697,24 @@
697697
#define WRITE_BARRIER(object, offset, value)
698698
#define WRITE_BARRIER_CPP(object, offset, value)
699699
#else
700-
#define WRITE_BARRIER(object, offset, value) \
701-
do { \
702-
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
703-
static_assert(kTaggedCanConvertToRawObjects); \
704-
CombinedWriteBarrier(object, Tagged(object)->RawField(offset), value, \
705-
UPDATE_WRITE_BARRIER); \
700+
#define WRITE_BARRIER(object, offset, value) \
701+
do { \
702+
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
703+
static_assert(kTaggedCanConvertToRawObjects); \
704+
CombinedWriteBarrier(object, (object)->RawField(offset), value, \
705+
UPDATE_WRITE_BARRIER); \
706706
} while (false)
707707
#endif
708708

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

0 commit comments

Comments
 (0)