Skip to content

Commit b530214

Browse files
targosmarco-ippolito
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 <technicalcute@gmail.com> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> PR-URL: #52293 Reviewed-By: Moshe Atlow <moshe@atlow.co.il> Reviewed-By: Richard Lau <rlau@redhat.com>
1 parent 8054f69 commit b530214

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
@@ -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

+12-12
Original file line numberDiff line numberDiff line change
@@ -671,24 +671,24 @@
671671
#define WRITE_BARRIER(object, offset, value)
672672
#define WRITE_BARRIER_CPP(object, offset, value)
673673
#else
674-
#define WRITE_BARRIER(object, offset, value) \
675-
do { \
676-
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
677-
static_assert(kTaggedCanConvertToRawObjects); \
678-
CombinedWriteBarrier(object, Tagged(object)->RawField(offset), value, \
679-
UPDATE_WRITE_BARRIER); \
674+
#define WRITE_BARRIER(object, offset, value) \
675+
do { \
676+
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
677+
static_assert(kTaggedCanConvertToRawObjects); \
678+
CombinedWriteBarrier(object, (object)->RawField(offset), value, \
679+
UPDATE_WRITE_BARRIER); \
680680
} while (false)
681681
#endif
682682

683683
#ifdef V8_DISABLE_WRITE_BARRIERS
684684
#define WEAK_WRITE_BARRIER(object, offset, value)
685685
#else
686-
#define WEAK_WRITE_BARRIER(object, offset, value) \
687-
do { \
688-
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
689-
static_assert(kTaggedCanConvertToRawObjects); \
690-
CombinedWriteBarrier(object, Tagged(object)->RawMaybeWeakField(offset), \
691-
value, UPDATE_WRITE_BARRIER); \
686+
#define WEAK_WRITE_BARRIER(object, offset, value) \
687+
do { \
688+
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
689+
static_assert(kTaggedCanConvertToRawObjects); \
690+
CombinedWriteBarrier(object, (object)->RawMaybeWeakField(offset), value, \
691+
UPDATE_WRITE_BARRIER); \
692692
} while (false)
693693
#endif
694694

0 commit comments

Comments
 (0)