Commit 2e0efc1
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
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 | |
|---|---|---|---|
@@ -666,24 +666,24 @@ | |||
| 666 | 666 | #define WRITE_BARRIER(object, offset, value) | |
| 667 | 667 | #define WRITE_BARRIER_CPP(object, offset, value) | |
| 668 | 668 | #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); \ | ||
| 675 | 675 | } while (false) | |
| 676 | 676 | #endif | |
| 677 | 677 | ||
| 678 | 678 | #ifdef V8_DISABLE_WRITE_BARRIERS | |
| 679 | 679 | #define WEAK_WRITE_BARRIER(object, offset, value) | |
| 680 | 680 | #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); \ | ||
| 687 | 687 | } while (false) | |
| 688 | 688 | #endif | |
| 689 | 689 | ||
0 commit comments