diff options
author | Michaël Zasso <targos@protonmail.com> | 2018-09-07 17:07:13 +0200 |
---|---|---|
committer | Michaël Zasso <targos@protonmail.com> | 2018-09-07 20:59:13 +0200 |
commit | 586db2414a338e1bf6eaf6e672a3adc7ce309f6a (patch) | |
tree | 139fa972aef648481ddee22a3a85b99707d28df5 /deps/v8/src/instruction-stream.cc | |
parent | 12ed7c94e5160aa6d38e3d2cb2a73dae0a6f9342 (diff) | |
download | android-node-v8-586db2414a338e1bf6eaf6e672a3adc7ce309f6a.tar.gz android-node-v8-586db2414a338e1bf6eaf6e672a3adc7ce309f6a.tar.bz2 android-node-v8-586db2414a338e1bf6eaf6e672a3adc7ce309f6a.zip |
deps: update V8 to 6.9.427.22
PR-URL: https://github.com/nodejs/node/pull/21983
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Diffstat (limited to 'deps/v8/src/instruction-stream.cc')
-rw-r--r-- | deps/v8/src/instruction-stream.cc | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/deps/v8/src/instruction-stream.cc b/deps/v8/src/instruction-stream.cc index ff140fe9e5..4b2a9012d6 100644 --- a/deps/v8/src/instruction-stream.cc +++ b/deps/v8/src/instruction-stream.cc @@ -13,17 +13,16 @@ namespace internal { // static bool InstructionStream::PcIsOffHeap(Isolate* isolate, Address pc) { -#ifdef V8_EMBEDDED_BUILTINS - const Address start = reinterpret_cast<Address>(isolate->embedded_blob()); - return start <= pc && pc < start + isolate->embedded_blob_size(); -#else - return false; -#endif + if (FLAG_embedded_builtins) { + const Address start = reinterpret_cast<Address>(isolate->embedded_blob()); + return start <= pc && pc < start + isolate->embedded_blob_size(); + } else { + return false; + } } // static Code* InstructionStream::TryLookupCode(Isolate* isolate, Address address) { -#ifdef V8_EMBEDDED_BUILTINS if (!PcIsOffHeap(isolate, address)) return nullptr; EmbeddedData d = EmbeddedData::FromBlob(); @@ -44,12 +43,8 @@ Code* InstructionStream::TryLookupCode(Isolate* isolate, Address address) { } UNREACHABLE(); -#else - return nullptr; -#endif } -#ifdef V8_EMBEDDED_BUILTINS // static void InstructionStream::CreateOffHeapInstructionStream(Isolate* isolate, uint8_t** data, @@ -80,7 +75,6 @@ void InstructionStream::FreeOffHeapInstructionStream(uint8_t* data, const uint32_t page_size = static_cast<uint32_t>(AllocatePageSize()); CHECK(FreePages(data, RoundUp(size, page_size))); } -#endif // V8_EMBEDDED_BUILTINS } // namespace internal } // namespace v8 |