Commit 785d5cd
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: #50115
Reviewed-By: Michael Dawson <midawson@redhat.com>1 parent 7071c1d commit 785d5cd
2 files changed
Lines changed: 13 additions & 13 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -36,7 +36,7 @@ | |||
| 36 | 36 | ||
| 37 | 37 | # Reset this number to 0 on major V8 upgrades. | |
| 38 | 38 | # Increment by one for each non-official patch applied to deps/v8. | |
| 39 | - 'v8_embedder_string': '-node.3', | ||
| 39 | + 'v8_embedder_string': '-node.4', | ||
| 40 | 40 | ||
| 41 | 41 | ##### V8 defaults for Node.js ##### | |
| 42 | 42 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -580,24 +580,24 @@ | |||
| 580 | 580 | #ifdef V8_DISABLE_WRITE_BARRIERS | |
| 581 | 581 | #define WRITE_BARRIER(object, offset, value) | |
| 582 | 582 | #else | |
| 583 | - #define WRITE_BARRIER(object, offset, value) \ | ||
| 584 | - do { \ | ||
| 585 | - DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \ | ||
| 586 | - static_assert(kTaggedCanConvertToRawObjects); \ | ||
| 587 | - CombinedWriteBarrier(object, Tagged(object)->RawField(offset), value, \ | ||
| 588 | - UPDATE_WRITE_BARRIER); \ | ||
| 583 | + #define WRITE_BARRIER(object, offset, value) \ | ||
| 584 | + do { \ | ||
| 585 | + DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \ | ||
| 586 | + static_assert(kTaggedCanConvertToRawObjects); \ | ||
| 587 | + CombinedWriteBarrier(object, (object)->RawField(offset), value, \ | ||
| 588 | + UPDATE_WRITE_BARRIER); \ | ||
| 589 | 589 | } while (false) | |
| 590 | 590 | #endif | |
| 591 | 591 | ||
| 592 | 592 | #ifdef V8_DISABLE_WRITE_BARRIERS | |
| 593 | 593 | #define WEAK_WRITE_BARRIER(object, offset, value) | |
| 594 | 594 | #else | |
| 595 | - #define WEAK_WRITE_BARRIER(object, offset, value) \ | ||
| 596 | - do { \ | ||
| 597 | - DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \ | ||
| 598 | - static_assert(kTaggedCanConvertToRawObjects); \ | ||
| 599 | - CombinedWriteBarrier(object, Tagged(object)->RawMaybeWeakField(offset), \ | ||
| 600 | - value, UPDATE_WRITE_BARRIER); \ | ||
| 595 | + #define WEAK_WRITE_BARRIER(object, offset, value) \ | ||
| 596 | + do { \ | ||
| 597 | + DCHECK_NOT_NULL(GetHeapFromWritableObject(object)); \ | ||
| 598 | + static_assert(kTaggedCanConvertToRawObjects); \ | ||
| 599 | + CombinedWriteBarrier(object, (object)->RawMaybeWeakField(offset), value, \ | ||
| 600 | + UPDATE_WRITE_BARRIER); \ | ||
| 601 | 601 | } while (false) | |
| 602 | 602 | #endif | |
| 603 | 603 | ||
0 commit comments