Skip to content

Commit 9c4030b

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 5f05cc1 commit 9c4030b

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
@@ -544,24 +544,24 @@
544544
#ifdef V8_DISABLE_WRITE_BARRIERS
545545
#define WRITE_BARRIER(object, offset, value)
546546
#else
547-
#define WRITE_BARRIER(object, offset, value) \
548-
do { \
549-
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
550-
static_assert(kTaggedCanConvertToRawObjects); \
551-
CombinedWriteBarrier(object, Tagged(object)->RawField(offset), value, \
552-
UPDATE_WRITE_BARRIER); \
547+
#define WRITE_BARRIER(object, offset, value) \
548+
do { \
549+
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
550+
static_assert(kTaggedCanConvertToRawObjects); \
551+
CombinedWriteBarrier(object, (object)->RawField(offset), value, \
552+
UPDATE_WRITE_BARRIER); \
553553
} while (false)
554554
#endif
555555

556556
#ifdef V8_DISABLE_WRITE_BARRIERS
557557
#define WEAK_WRITE_BARRIER(object, offset, value)
558558
#else
559-
#define WEAK_WRITE_BARRIER(object, offset, value) \
560-
do { \
561-
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
562-
static_assert(kTaggedCanConvertToRawObjects); \
563-
CombinedWriteBarrier(object, Tagged(object)->RawMaybeWeakField(offset), \
564-
value, UPDATE_WRITE_BARRIER); \
559+
#define WEAK_WRITE_BARRIER(object, offset, value) \
560+
do { \
561+
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
562+
static_assert(kTaggedCanConvertToRawObjects); \
563+
CombinedWriteBarrier(object, (object)->RawMaybeWeakField(offset), value, \
564+
UPDATE_WRITE_BARRIER); \
565565
} while (false)
566566
#endif
567567

0 commit comments

Comments
 (0)