diff options
author | Refael Ackermann <refack@gmail.com> | 2019-05-26 14:19:09 -0400 |
---|---|---|
committer | Michaël Zasso <targos@protonmail.com> | 2019-08-01 12:56:07 +0200 |
commit | ba6c9f541f0535ffb83b95836b7189f2924f3392 (patch) | |
tree | 7f428a271ad0ac2f49a93fbf67316d91fa28a36d | |
parent | cd70e59563f3445ac2463fe96c13ecd547445309 (diff) | |
download | android-node-v8-ba6c9f541f0535ffb83b95836b7189f2924f3392.tar.gz android-node-v8-ba6c9f541f0535ffb83b95836b7189f2924f3392.tar.bz2 android-node-v8-ba6c9f541f0535ffb83b95836b7189f2924f3392.zip |
deps: V8: fix BUILDING_V8_SHARED issues
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>
-rw-r--r-- | common.gypi | 2 | ||||
-rw-r--r-- | deps/v8/src/init/setup-isolate-deserialize.cc | 1 | ||||
-rw-r--r-- | deps/v8/src/objects/ordered-hash-table.cc | 4 | ||||
-rw-r--r-- | deps/v8/src/snapshot/snapshot.h | 1 |
4 files changed, 7 insertions, 1 deletions
diff --git a/common.gypi b/common.gypi index 787d627086..60d7697495 100644 --- a/common.gypi +++ b/common.gypi @@ -39,7 +39,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.8', + 'v8_embedder_string': '-node.9', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/src/init/setup-isolate-deserialize.cc b/deps/v8/src/init/setup-isolate-deserialize.cc index ff0268d3c8..8a73ff0c8a 100644 --- a/deps/v8/src/init/setup-isolate-deserialize.cc +++ b/deps/v8/src/init/setup-isolate-deserialize.cc @@ -7,6 +7,7 @@ #include "src/base/logging.h" #include "src/execution/isolate.h" #include "src/interpreter/interpreter.h" +#include "src/objects/objects-inl.h" #include "src/utils/ostreams.h" namespace v8 { diff --git a/deps/v8/src/objects/ordered-hash-table.cc b/deps/v8/src/objects/ordered-hash-table.cc index 3d628cc406..c4e64d2d6a 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/snapshot/snapshot.h b/deps/v8/src/snapshot/snapshot.h index a9995b2d3e..ef933ef83a 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/objects-inl.h" #include "src/utils/utils.h" namespace v8 { |