mirror of
https://github.com/nodejs/node.git
synced 2024-11-27 22:16:50 +01:00
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> deps: patch for v8 on windows PR-URL: https://github.com/nodejs/node/pull/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: https://github.com/nodejs/node/pull/40060 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> deps: workaround debug link error on Windows PR-URL: https://github.com/nodejs/node/pull/38807 Refs: https://github.com/nodejs/node/pull/38788 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Ash Cripps <acripps@redhat.com>
This commit is contained in:
parent
01bc8e6fd8
commit
eac4bbded1
@ -36,7 +36,7 @@
|
||||
|
||||
# Reset this number to 0 on major V8 upgrades.
|
||||
# Increment by one for each non-official patch applied to deps/v8.
|
||||
'v8_embedder_string': '-node.1',
|
||||
'v8_embedder_string': '-node.2',
|
||||
|
||||
##### V8 defaults for Node.js #####
|
||||
|
||||
|
2
deps/v8/src/objects/fixed-array-inl.h
vendored
2
deps/v8/src/objects/fixed-array-inl.h
vendored
@ -83,6 +83,7 @@ bool FixedArray::is_the_hole(Isolate* isolate, int index) {
|
||||
return get(isolate, index).IsTheHole(isolate);
|
||||
}
|
||||
|
||||
#if !defined(_WIN32) || (defined(_WIN64) && _MSC_VER < 1930 && __cplusplus < 201703L)
|
||||
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()));
|
||||
@ -90,6 +91,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());
|
||||
|
13
deps/v8/src/objects/fixed-array.h
vendored
13
deps/v8/src/objects/fixed-array.h
vendored
@ -142,7 +142,20 @@ class FixedArray
|
||||
inline bool is_the_hole(Isolate* isolate, int index);
|
||||
|
||||
// Setter that doesn't need write barrier.
|
||||
#if !defined(_WIN32) || (defined(_WIN64) && _MSC_VER < 1930 && __cplusplus < 201703L)
|
||||
inline void set(int index, Smi value);
|
||||
#else
|
||||
inline void set(int index, Smi value) {
|
||||
#if !defined(_WIN32)
|
||||
DCHECK_NE(map(), GetReadOnlyRoots().fixed_cow_array_map());
|
||||
#endif
|
||||
DCHECK_LT(static_cast<unsigned>(index), static_cast<unsigned>(length()));
|
||||
DCHECK(Object(value).IsSmi());
|
||||
int offset = OffsetOfElementAt(index);
|
||||
RELAXED_WRITE_FIELD(*this, offset, value);
|
||||
}
|
||||
#endif
|
||||
|
||||
// Setter with explicit barrier mode.
|
||||
inline void set(int index, Object value, WriteBarrierMode mode);
|
||||
|
||||
|
2
deps/v8/src/objects/tagged-field.h
vendored
2
deps/v8/src/objects/tagged-field.h
vendored
@ -49,7 +49,7 @@ class TaggedField : public AllStatic {
|
||||
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);
|
||||
static inline T Acquire_Load_No_Unpack(PtrComprCageBase cage_base,
|
||||
|
Loading…
Reference in New Issue
Block a user