Skip to content

Commit

Permalink
deps: avoid compilation error with ASan
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
targos authored and marco-ippolito committed Apr 19, 2024
1 parent 8054f69 commit b530214
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

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

##### V8 defaults for Node.js #####

Expand Down
24 changes: 12 additions & 12 deletions deps/v8/src/objects/object-macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -671,24 +671,24 @@
#define WRITE_BARRIER(object, offset, value)
#define WRITE_BARRIER_CPP(object, offset, value)
#else
#define WRITE_BARRIER(object, offset, value) \
do { \
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
static_assert(kTaggedCanConvertToRawObjects); \
CombinedWriteBarrier(object, Tagged(object)->RawField(offset), value, \
UPDATE_WRITE_BARRIER); \
#define WRITE_BARRIER(object, offset, value) \
do { \
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
static_assert(kTaggedCanConvertToRawObjects); \
CombinedWriteBarrier(object, (object)->RawField(offset), value, \
UPDATE_WRITE_BARRIER); \
} while (false)
#endif

#ifdef V8_DISABLE_WRITE_BARRIERS
#define WEAK_WRITE_BARRIER(object, offset, value)
#else
#define WEAK_WRITE_BARRIER(object, offset, value) \
do { \
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
static_assert(kTaggedCanConvertToRawObjects); \
CombinedWriteBarrier(object, Tagged(object)->RawMaybeWeakField(offset), \
value, UPDATE_WRITE_BARRIER); \
#define WEAK_WRITE_BARRIER(object, offset, value) \
do { \
DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \
static_assert(kTaggedCanConvertToRawObjects); \
CombinedWriteBarrier(object, (object)->RawMaybeWeakField(offset), value, \
UPDATE_WRITE_BARRIER); \
} while (false)
#endif

Expand Down

0 comments on commit b530214

Please sign in to comment.