Commit 1aea6a7
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>
deps: patch for v8 on windows
PR-URL: #40010
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
deps: patch v8 for vs2019 in std17
PR-URL: #40060
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>1 parent e981215 commit 1aea6a7
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 | |
|---|---|---|---|
@@ -84,13 +84,15 @@ bool FixedArray::is_the_hole(Isolate* isolate, int index) { | |||
| 84 | 84 | return get(isolate, index).IsTheHole(isolate); | |
| 85 | 85 | } | |
| 86 | 86 | ||
| 87 | + #if !defined(_WIN32) || (defined(_WIN64) && _MSC_VER < 1930 && __cplusplus < 201703L) | ||
| 87 | 88 | void FixedArray::set(int index, Smi value) { | |
| 88 | 89 | DCHECK_NE(map(), GetReadOnlyRoots().fixed_cow_array_map()); | |
| 89 | 90 | DCHECK_LT(static_cast<unsigned>(index), static_cast<unsigned>(length())); | |
| 90 | 91 | DCHECK(Object(value).IsSmi()); | |
| 91 | 92 | int offset = OffsetOfElementAt(index); | |
| 92 | 93 | RELAXED_WRITE_FIELD(*this, offset, value); | |
| 93 | 94 | } | |
| 95 | + #endif | ||
| 94 | 96 | ||
| 95 | 97 | void FixedArray::set(int index, Object value) { | |
| 96 | 98 | DCHECK_NE(GetReadOnlyRoots().fixed_cow_array_map(), map()); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -134,7 +134,18 @@ class FixedArray | |||
| 134 | 134 | inline bool is_the_hole(Isolate* isolate, int index); | |
| 135 | 135 | ||
| 136 | 136 | // Setter that doesn't need write barrier. | |
| 137 | + #if !defined(_WIN32) || (defined(_WIN64) && _MSC_VER < 1930 && __cplusplus < 201703L) | ||
| 137 | 138 | inline void set(int index, Smi value); | |
| 139 | + #else | ||
| 140 | + inline void set(int index, Smi value) { | ||
| 141 | + DCHECK_NE(map(), GetReadOnlyRoots().fixed_cow_array_map()); | ||
| 142 | + DCHECK_LT(static_cast<unsigned>(index), static_cast<unsigned>(length())); | ||
| 143 | + DCHECK(Object(value).IsSmi()); | ||
| 144 | + int offset = OffsetOfElementAt(index); | ||
| 145 | + RELAXED_WRITE_FIELD(*this, offset, value); | ||
| 146 | + } | ||
| 147 | + #endif | ||
| 148 | + | ||
| 138 | 149 | // Setter with explicit barrier mode. | |
| 139 | 150 | inline void set(int index, Object value, WriteBarrierMode mode); | |
| 140 | 151 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -49,7 +49,7 @@ class TaggedField : public AllStatic { | |||
| 49 | 49 | int offset = 0); | |
| 50 | 50 | ||
| 51 | 51 | static inline void Relaxed_Store(HeapObject host, T value); | |
| 52 | - static inline void Relaxed_Store(HeapObject host, int offset, T value); | ||
| 52 | + static void Relaxed_Store(HeapObject host, int offset, T value); | ||
| 53 | 53 | ||
| 54 | 54 | static inline T Acquire_Load(HeapObject host, int offset = 0); | |
| 55 | 55 | static inline T Acquire_Load_No_Unpack(PtrComprCageBase cage_base, | |
0 commit comments