From ba6c9f541f0535ffb83b95836b7189f2924f3392 Mon Sep 17 00:00:00 2001 From: Refael Ackermann Date: Sun, 26 May 2019 14:19:09 -0400 Subject: deps: V8: fix BUILDING_V8_SHARED issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/27375 Reviewed-By: Michaƫl Zasso Reviewed-By: Ujjwal Sharma Reviewed-By: Refael Ackermann Reviewed-By: Matteo Collina Reviewed-By: Colin Ihrig Reviewed-By: Rich Trott --- common.gypi | 2 +- deps/v8/src/init/setup-isolate-deserialize.cc | 1 + deps/v8/src/objects/ordered-hash-table.cc | 4 ++++ deps/v8/src/snapshot/snapshot.h | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) 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::Allocate(Isolate* isolate, int capacity); +#if !defined(V8_OS_WIN) template bool OrderedHashTableHandler::Delete( Handle table, Handle key) { @@ -942,7 +943,9 @@ bool OrderedHashTableHandler::Delete( // down to a smaller hash table. return LargeTable::Delete(Handle::cast(table), key); } +#endif +#if !defined(V8_OS_WIN) template bool OrderedHashTableHandler::HasKey( Isolate* isolate, Handle table, Handle key) { @@ -953,6 +956,7 @@ bool OrderedHashTableHandler::HasKey( DCHECK(LargeTable::Is(table)); return LargeTable::HasKey(isolate, LargeTable::cast(*table), *key); } +#endif template bool OrderedHashTableHandler::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 { -- cgit v1.2.3