diff options
| author | Jiawen Geng <technicalcute@gmail.com> | 2020-10-14 12:22:20 +0000 |
|---|---|---|
| committer | Michaël Zasso <targos@protonmail.com> | 2020-11-15 16:47:23 +0100 |
| commit | 6200176ef08f45002aa496507d86110f3689fd00 (patch) | |
| tree | 007dc3badf8f20f2f9123cee856012330bf79838 /deps | |
| parent | bd5642deb9c6fb68309564d4de7142a7671ed8db (diff) | |
| download | node-new-6200176ef08f45002aa496507d86110f3689fd00.tar.gz | |
deps: fix V8 build issue with inline methods
PR-URL: https://github.com/nodejs/node/pull/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>
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/v8/src/objects/fixed-array-inl.h | 2 | ||||
| -rw-r--r-- | deps/v8/src/objects/fixed-array.h | 11 | ||||
| -rw-r--r-- | deps/v8/src/objects/tagged-field.h | 6 |
3 files changed, 16 insertions, 3 deletions
diff --git a/deps/v8/src/objects/fixed-array-inl.h b/deps/v8/src/objects/fixed-array-inl.h index e602243158..ed2d952b96 100644 --- a/deps/v8/src/objects/fixed-array-inl.h +++ b/deps/v8/src/objects/fixed-array-inl.h @@ -87,6 +87,7 @@ bool FixedArray::is_the_hole(Isolate* isolate, int index) { return get(isolate, index).IsTheHole(isolate); } +#if !defined(_WIN32) || defined(_WIN64) void FixedArray::set(int index, Smi value) { DCHECK_NE(map(), GetReadOnlyRoots().fixed_cow_array_map()); DCHECK_LT(static_cast<unsigned>(index), static_cast<unsigned>(length())); @@ -94,6 +95,7 @@ void FixedArray::set(int index, Smi value) { int offset = OffsetOfElementAt(index); RELAXED_WRITE_FIELD(*this, offset, value); } +#endif void FixedArray::set(int index, Object value) { DCHECK_NE(GetReadOnlyRoots().fixed_cow_array_map(), map()); diff --git a/deps/v8/src/objects/fixed-array.h b/deps/v8/src/objects/fixed-array.h index 5054f16b41..13148b2099 100644 --- a/deps/v8/src/objects/fixed-array.h +++ b/deps/v8/src/objects/fixed-array.h @@ -122,7 +122,18 @@ class FixedArray inline bool is_the_hole(Isolate* isolate, int index); // Setter that doesn't need write barrier. +#if defined(_WIN32) && !defined(_WIN64) + inline void set(int index, Smi value) { + DCHECK_NE(map(), GetReadOnlyRoots().fixed_cow_array_map()); + DCHECK_LT(static_cast<unsigned>(index), static_cast<unsigned>(length())); + DCHECK(Object(value).IsSmi()); + int offset = OffsetOfElementAt(index); + RELAXED_WRITE_FIELD(*this, offset, value); + } +#else inline void set(int index, Smi value); +#endif + // Setter with explicit barrier mode. inline void set(int index, Object value, WriteBarrierMode mode); diff --git a/deps/v8/src/objects/tagged-field.h b/deps/v8/src/objects/tagged-field.h index 947bf6247b..82b6268ecd 100644 --- a/deps/v8/src/objects/tagged-field.h +++ b/deps/v8/src/objects/tagged-field.h @@ -45,11 +45,11 @@ class TaggedField : public AllStatic { static inline T Relaxed_Load(HeapObject host, int offset = 0); template <typename LocalIsolate> - static inline T Relaxed_Load(const LocalIsolate* isolate, HeapObject host, - int offset = 0); + static T Relaxed_Load(const LocalIsolate* isolate, HeapObject host, + int offset = 0); static inline void Relaxed_Store(HeapObject host, T value); - static inline void Relaxed_Store(HeapObject host, int offset, T value); + static void Relaxed_Store(HeapObject host, int offset, T value); static inline T Acquire_Load(HeapObject host, int offset = 0); template <typename LocalIsolate> |