diff options
| author | Refael Ackermann <refack@gmail.com> | 2019-05-26 14:19:09 -0400 |
|---|---|---|
| committer | Michaël Zasso <targos@protonmail.com> | 2019-06-04 18:46:02 +0200 |
| commit | bb729a415a1c3fe88f45f3b3af67f79d333e24ff (patch) | |
| tree | aa5e24ee774c52dfbd14f81f1b8fd9fb4a165146 /deps/v8 | |
| parent | f8a33abe0c6b9b83169729eedeb4c5211fc020fa (diff) | |
| download | android-node-v8-bb729a415a1c3fe88f45f3b3af67f79d333e24ff.tar.gz android-node-v8-bb729a415a1c3fe88f45f3b3af67f79d333e24ff.tar.bz2 android-node-v8-bb729a415a1c3fe88f45f3b3af67f79d333e24ff.zip | |
deps: V8: fix BUILDING_V8_SHARED issues
Backport-PR-URL: https://github.com/nodejs/node/pull/28005
PR-URL: https://github.com/nodejs/node/pull/27375
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Diffstat (limited to 'deps/v8')
| -rw-r--r-- | deps/v8/src/objects/ordered-hash-table.cc | 4 | ||||
| -rw-r--r-- | deps/v8/src/setup-isolate-deserialize.cc | 1 | ||||
| -rw-r--r-- | deps/v8/src/snapshot/snapshot.h | 1 | ||||
| -rw-r--r-- | deps/v8/src/vector.h | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/deps/v8/src/objects/ordered-hash-table.cc b/deps/v8/src/objects/ordered-hash-table.cc index 149a5c5715..0b52160805 100644 --- a/deps/v8/src/objects/ordered-hash-table.cc +++ b/deps/v8/src/objects/ordered-hash-table.cc @@ -930,6 +930,7 @@ OrderedHashTableHandler<SmallOrderedNameDictionary, OrderedNameDictionary>::Allocate(Isolate* isolate, int capacity); +#if !defined(V8_OS_WIN) template <class SmallTable, class LargeTable> bool OrderedHashTableHandler<SmallTable, LargeTable>::Delete( Handle<HeapObject> table, Handle<Object> key) { @@ -942,7 +943,9 @@ bool OrderedHashTableHandler<SmallTable, LargeTable>::Delete( // down to a smaller hash table. return LargeTable::Delete(Handle<LargeTable>::cast(table), key); } +#endif +#if !defined(V8_OS_WIN) template <class SmallTable, class LargeTable> bool OrderedHashTableHandler<SmallTable, LargeTable>::HasKey( Isolate* isolate, Handle<HeapObject> table, Handle<Object> key) { @@ -953,6 +956,7 @@ bool OrderedHashTableHandler<SmallTable, LargeTable>::HasKey( DCHECK(LargeTable::Is(table)); return LargeTable::HasKey(isolate, LargeTable::cast(*table), *key); } +#endif template bool OrderedHashTableHandler<SmallOrderedHashSet, OrderedHashSet>::HasKey( diff --git a/deps/v8/src/setup-isolate-deserialize.cc b/deps/v8/src/setup-isolate-deserialize.cc index fdfaa7e188..d68fee95f6 100644 --- a/deps/v8/src/setup-isolate-deserialize.cc +++ b/deps/v8/src/setup-isolate-deserialize.cc @@ -8,6 +8,7 @@ #include "src/interpreter/interpreter.h" #include "src/isolate.h" #include "src/ostreams.h" +#include "src/objects-inl.h" namespace v8 { namespace internal { diff --git a/deps/v8/src/snapshot/snapshot.h b/deps/v8/src/snapshot/snapshot.h index e8894a2331..9ac556bc61 100644 --- a/deps/v8/src/snapshot/snapshot.h +++ b/deps/v8/src/snapshot/snapshot.h @@ -8,6 +8,7 @@ #include "src/snapshot/partial-serializer.h" #include "src/snapshot/startup-serializer.h" +#include "src/objects-inl.h" #include "src/utils.h" namespace v8 { diff --git a/deps/v8/src/vector.h b/deps/v8/src/vector.h index 76c93e00e9..03438959fc 100644 --- a/deps/v8/src/vector.h +++ b/deps/v8/src/vector.h @@ -321,6 +321,7 @@ class EmbeddedVector : public Vector<T> { } } +#if !defined(V8_OS_WIN) // When copying, make underlying Vector to reference our buffer. EmbeddedVector(const EmbeddedVector& rhs) V8_NOEXCEPT : Vector<T>(rhs) { MemCopy(buffer_, rhs.buffer_, sizeof(T) * kSize); @@ -334,6 +335,7 @@ class EmbeddedVector : public Vector<T> { this->set_start(buffer_); return *this; } +#endif private: T buffer_[kSize]; |