Skip to content

Commit 2e0efc1

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 <technicalcute@gmail.com> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> PR-URL: #51362 Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
1 parent 59e6f62 commit 2e0efc1

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
@@ -666,24 +666,24 @@
666666
#define WRITE_BARRIER(object, offset, value)
667667
#define WRITE_BARRIER_CPP(object, offset, value)
668668
#else
669-
#define WRITE_BARRIER(object, offset, value) \
670-
do { \
671-
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
672-
static_assert(kTaggedCanConvertToRawObjects); \
673-
CombinedWriteBarrier(object, Tagged(object)->RawField(offset), value, \
674-
UPDATE_WRITE_BARRIER); \
669+
#define WRITE_BARRIER(object, offset, value) \
670+
do { \
671+
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
672+
static_assert(kTaggedCanConvertToRawObjects); \
673+
CombinedWriteBarrier(object, (object)->RawField(offset), value, \
674+
UPDATE_WRITE_BARRIER); \
675675
} while (false)
676676
#endif
677677

678678
#ifdef V8_DISABLE_WRITE_BARRIERS
679679
#define WEAK_WRITE_BARRIER(object, offset, value)
680680
#else
681-
#define WEAK_WRITE_BARRIER(object, offset, value) \
682-
do { \
683-
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
684-
static_assert(kTaggedCanConvertToRawObjects); \
685-
CombinedWriteBarrier(object, Tagged(object)->RawMaybeWeakField(offset), \
686-
value, UPDATE_WRITE_BARRIER); \
681+
#define WEAK_WRITE_BARRIER(object, offset, value) \
682+
do { \
683+
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
684+
static_assert(kTaggedCanConvertToRawObjects); \
685+
CombinedWriteBarrier(object, (object)->RawMaybeWeakField(offset), value, \
686+
UPDATE_WRITE_BARRIER); \
687687
} while (false)
688688
#endif
689689

0 commit comments

Comments
 (0)