Commit d2c84c9
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: #52465
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Michael Dawson <midawson@redhat.com>1 parent 95d6045 commit d2c84c9
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 | |
|---|---|---|---|
@@ -697,24 +697,24 @@ | |||
| 697 | 697 | #define WRITE_BARRIER(object, offset, value) | |
| 698 | 698 | #define WRITE_BARRIER_CPP(object, offset, value) | |
| 699 | 699 | #else | |
| 700 | - #define WRITE_BARRIER(object, offset, value) \ | ||
| 701 | - do { \ | ||
| 702 | - DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \ | ||
| 703 | - static_assert(kTaggedCanConvertToRawObjects); \ | ||
| 704 | - CombinedWriteBarrier(object, Tagged(object)->RawField(offset), value, \ | ||
| 705 | - UPDATE_WRITE_BARRIER); \ | ||
| 700 | + #define WRITE_BARRIER(object, offset, value) \ | ||
| 701 | + do { \ | ||
| 702 | + DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \ | ||
| 703 | + static_assert(kTaggedCanConvertToRawObjects); \ | ||
| 704 | + CombinedWriteBarrier(object, (object)->RawField(offset), value, \ | ||
| 705 | + UPDATE_WRITE_BARRIER); \ | ||
| 706 | 706 | } while (false) | |
| 707 | 707 | #endif | |
| 708 | 708 | ||
| 709 | 709 | #ifdef V8_DISABLE_WRITE_BARRIERS | |
| 710 | 710 | #define WEAK_WRITE_BARRIER(object, offset, value) | |
| 711 | 711 | #else | |
| 712 | - #define WEAK_WRITE_BARRIER(object, offset, value) \ | ||
| 713 | - do { \ | ||
| 714 | - DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \ | ||
| 715 | - static_assert(kTaggedCanConvertToRawObjects); \ | ||
| 716 | - CombinedWriteBarrier(object, Tagged(object)->RawMaybeWeakField(offset), \ | ||
| 717 | - value, UPDATE_WRITE_BARRIER); \ | ||
| 712 | + #define WEAK_WRITE_BARRIER(object, offset, value) \ | ||
| 713 | + do { \ | ||
| 714 | + DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \ | ||
| 715 | + static_assert(kTaggedCanConvertToRawObjects); \ | ||
| 716 | + CombinedWriteBarrier(object, (object)->RawMaybeWeakField(offset), value, \ | ||
| 717 | + UPDATE_WRITE_BARRIER); \ | ||
| 718 | 718 | } while (false) | |
| 719 | 719 | #endif | |
| 720 | 720 | ||
0 commit comments