Skip to content

Commit 10c793b

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 5fa645c commit 10c793b

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

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -707,24 +707,24 @@
707707
#define WRITE_BARRIER(object, offset, value)
708708
#define WRITE_BARRIER_CPP(object, offset, value)
709709
#else
710-
#define WRITE_BARRIER(object, offset, value) \
711-
do { \
712-
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
713-
static_assert(kTaggedCanConvertToRawObjects); \
714-
CombinedWriteBarrier(object, Tagged(object)->RawField(offset), value, \
715-
UPDATE_WRITE_BARRIER); \
710+
#define WRITE_BARRIER(object, offset, value) \
711+
do { \
712+
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
713+
static_assert(kTaggedCanConvertToRawObjects); \
714+
CombinedWriteBarrier(object, (object)->RawField(offset), value, \
715+
UPDATE_WRITE_BARRIER); \
716716
} while (false)
717717
#endif
718718

719719
#ifdef V8_DISABLE_WRITE_BARRIERS
720720
#define WEAK_WRITE_BARRIER(object, offset, value)
721721
#else
722-
#define WEAK_WRITE_BARRIER(object, offset, value) \
723-
do { \
724-
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
725-
static_assert(kTaggedCanConvertToRawObjects); \
726-
CombinedWriteBarrier(object, Tagged(object)->RawMaybeWeakField(offset), \
727-
value, UPDATE_WRITE_BARRIER); \
722+
#define WEAK_WRITE_BARRIER(object, offset, value) \
723+
do { \
724+
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
725+
static_assert(kTaggedCanConvertToRawObjects); \
726+
CombinedWriteBarrier(object, (object)->RawMaybeWeakField(offset), value, \
727+
UPDATE_WRITE_BARRIER); \
728728
} while (false)
729729
#endif
730730

0 commit comments

Comments
 (0)