Commit b530214
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
2 files changed
Lines changed: 13 additions & 13 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -37,7 +37,7 @@ | |||
| 37 | 37 | ||
| 38 | 38 | # Reset this number to 0 on major V8 upgrades. | |
| 39 | 39 | # Increment by one for each non-official patch applied to deps/v8. | |
| 40 | - 'v8_embedder_string': '-node.3', | ||
| 40 | + 'v8_embedder_string': '-node.4', | ||
| 41 | 41 | ||
| 42 | 42 | ##### V8 defaults for Node.js ##### | |
| 43 | 43 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -671,24 +671,24 @@ | |||
| 671 | 671 | #define WRITE_BARRIER(object, offset, value) | |
| 672 | 672 | #define WRITE_BARRIER_CPP(object, offset, value) | |
| 673 | 673 | #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); \ | ||
| 680 | 680 | } while (false) | |
| 681 | 681 | #endif | |
| 682 | 682 | ||
| 683 | 683 | #ifdef V8_DISABLE_WRITE_BARRIERS | |
| 684 | 684 | #define WEAK_WRITE_BARRIER(object, offset, value) | |
| 685 | 685 | #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); \ | ||
| 692 | 692 | } while (false) | |
| 693 | 693 | #endif | |
| 694 | 694 | ||
0 commit comments