Commit 0d78bc3
deps: fix V8 build issue with inline methods
PR-URL: #35415
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>1 parent 5214918 commit 0d78bc3
4 files changed
Lines changed: 15 additions & 2 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.4', | ||
| 39 | + 'v8_embedder_string': '-node.5', | ||
| 40 | 40 | ||
| 41 | 41 | ##### V8 defaults for Node.js ##### | |
| 42 | 42 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -88,13 +88,15 @@ bool FixedArray::is_the_hole(Isolate* isolate, int index) { | |||
| 88 | 88 | return get(isolate, index).IsTheHole(isolate); | |
| 89 | 89 | } | |
| 90 | 90 | ||
| 91 | + #if !defined(_WIN32) || defined(_WIN64) | ||
| 91 | 92 | void FixedArray::set(int index, Smi value) { | |
| 92 | 93 | DCHECK_NE(map(), GetReadOnlyRoots().fixed_cow_array_map()); | |
| 93 | 94 | DCHECK_LT(static_cast<unsigned>(index), static_cast<unsigned>(length())); | |
| 94 | 95 | DCHECK(Object(value).IsSmi()); | |
| 95 | 96 | int offset = OffsetOfElementAt(index); | |
| 96 | 97 | RELAXED_WRITE_FIELD(*this, offset, value); | |
| 97 | 98 | } | |
| 99 | + #endif | ||
| 98 | 100 | ||
| 99 | 101 | void FixedArray::set(int index, Object value) { | |
| 100 | 102 | DCHECK_NE(GetReadOnlyRoots().fixed_cow_array_map(), map()); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -130,7 +130,18 @@ class FixedArray | |||
| 130 | 130 | inline bool is_the_hole(Isolate* isolate, int index); | |
| 131 | 131 | ||
| 132 | 132 | // Setter that doesn't need write barrier. | |
| 133 | + #if defined(_WIN32) && !defined(_WIN64) | ||
| 134 | + inline void set(int index, Smi value) { | ||
| 135 | + DCHECK_NE(map(), GetReadOnlyRoots().fixed_cow_array_map()); | ||
| 136 | + DCHECK_LT(static_cast<unsigned>(index), static_cast<unsigned>(length())); | ||
| 137 | + DCHECK(Object(value).IsSmi()); | ||
| 138 | + int offset = OffsetOfElementAt(index); | ||
| 139 | + RELAXED_WRITE_FIELD(*this, offset, value); | ||
| 140 | + } | ||
| 141 | + #else | ||
| 133 | 142 | inline void set(int index, Smi value); | |
| 143 | + #endif | ||
| 144 | + | ||
| 134 | 145 | // Setter with explicit barrier mode. | |
| 135 | 146 | inline void set(int index, Object value, WriteBarrierMode mode); | |
| 136 | 147 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -48,7 +48,7 @@ class TaggedField : public AllStatic { | |||
| 48 | 48 | int offset = 0); | |
| 49 | 49 | ||
| 50 | 50 | static inline void Relaxed_Store(HeapObject host, T value); | |
| 51 | - static inline void Relaxed_Store(HeapObject host, int offset, T value); | ||
| 51 | + static void Relaxed_Store(HeapObject host, int offset, T value); | ||
| 52 | 52 | ||
| 53 | 53 | static inline T Acquire_Load(HeapObject host, int offset = 0); | |
| 54 | 54 | static inline T Acquire_Load(IsolateRoot isolate, HeapObject host, | |
0 commit comments