From a85d5b4b9e52e14833a4c2abdd8c3b380aba69e7 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Wed, 10 Oct 2018 15:19:16 -0700 Subject: [PATCH] deps: move more deprecations to V8_DEPRECATED These APIs have been deprecated upstream in V8. PR-URL: https://github.com/nodejs/node/pull/23414 Reviewed-By: James M Snell --- common.gypi | 2 +- deps/v8/include/v8.h | 48 ++++++++++++++++++++++---------------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/common.gypi b/common.gypi index 1508097e1d2a44..bacd496538a383 100644 --- a/common.gypi +++ b/common.gypi @@ -33,7 +33,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.6', + 'v8_embedder_string': '-node.7', # Enable disassembler for `--print-code` v8 options 'v8_enable_disassembler': 1, diff --git a/deps/v8/include/v8.h b/deps/v8/include/v8.h index 6c3cc84fba718e..c48025871aa85b 100644 --- a/deps/v8/include/v8.h +++ b/deps/v8/include/v8.h @@ -1963,9 +1963,9 @@ class V8_EXPORT JSON { * \param json_string The string to parse. * \return The corresponding value if successfully parsed. */ - static V8_DEPRECATE_SOON("Use the maybe version taking context", - MaybeLocal Parse(Isolate* isolate, - Local json_string)); + static V8_DEPRECATED("Use the maybe version taking context", + MaybeLocal Parse(Isolate* isolate, + Local json_string)); static V8_WARN_UNUSED_RESULT MaybeLocal Parse( Local context, Local json_string); @@ -2065,7 +2065,7 @@ class V8_EXPORT ValueSerializer { * Returns the stored data. This serializer should not be used once the buffer * is released. The contents are undefined if a previous write has failed. */ - V8_DEPRECATE_SOON("Use Release()", std::vector ReleaseBuffer()); + V8_DEPRECATED("Use Release()", std::vector ReleaseBuffer()); /** * Returns the stored data (allocated using the delegate's @@ -2086,10 +2086,10 @@ class V8_EXPORT ValueSerializer { /** * Similar to TransferArrayBuffer, but for SharedArrayBuffer. */ - V8_DEPRECATE_SOON("Use Delegate::GetSharedArrayBufferId", - void TransferSharedArrayBuffer( - uint32_t transfer_id, - Local shared_array_buffer)); + V8_DEPRECATED("Use Delegate::GetSharedArrayBufferId", + void TransferSharedArrayBuffer( + uint32_t transfer_id, + Local shared_array_buffer)); /** * Indicate whether to treat ArrayBufferView objects as host objects, @@ -3439,7 +3439,7 @@ class V8_EXPORT Object : public Value { V8_WARN_UNUSED_RESULT Maybe Has(Local context, Local key); - V8_DEPRECATE_SOON("Use maybe version", bool Delete(Local key)); + V8_DEPRECATED("Use maybe version", bool Delete(Local key)); V8_WARN_UNUSED_RESULT Maybe Delete(Local context, Local key); @@ -5148,8 +5148,8 @@ class V8_EXPORT SharedArrayBuffer : public Object { */ class V8_EXPORT Date : public Object { public: - static V8_DEPRECATE_SOON("Use maybe version.", - Local New(Isolate* isolate, double time)); + static V8_DEPRECATED("Use maybe version.", + Local New(Isolate* isolate, double time)); static V8_WARN_UNUSED_RESULT MaybeLocal New(Local context, double time); @@ -6408,14 +6408,14 @@ class V8_EXPORT ResourceConstraints { uint64_t virtual_memory_limit); // Returns the max semi-space size in MB. - V8_DEPRECATE_SOON("Use max_semi_space_size_in_kb()", - size_t max_semi_space_size()) { + V8_DEPRECATED("Use max_semi_space_size_in_kb()", + size_t max_semi_space_size()) { return max_semi_space_size_in_kb_ / 1024; } // Sets the max semi-space size in MB. - V8_DEPRECATE_SOON("Use set_max_semi_space_size_in_kb(size_t limit_in_kb)", - void set_max_semi_space_size(size_t limit_in_mb)) { + V8_DEPRECATED("Use set_max_semi_space_size_in_kb(size_t limit_in_kb)", + void set_max_semi_space_size(size_t limit_in_mb)) { max_semi_space_size_in_kb_ = limit_in_mb * 1024; } @@ -6433,12 +6433,12 @@ class V8_EXPORT ResourceConstraints { void set_max_old_space_size(size_t limit_in_mb) { max_old_space_size_ = limit_in_mb; } - V8_DEPRECATE_SOON("max_executable_size_ is subsumed by max_old_space_size_", - size_t max_executable_size() const) { + V8_DEPRECATED("max_executable_size_ is subsumed by max_old_space_size_", + size_t max_executable_size() const) { return max_executable_size_; } - V8_DEPRECATE_SOON("max_executable_size_ is subsumed by max_old_space_size_", - void set_max_executable_size(size_t limit_in_mb)) { + V8_DEPRECATED("max_executable_size_ is subsumed by max_old_space_size_", + void set_max_executable_size(size_t limit_in_mb)) { max_executable_size_ = limit_in_mb; } uint32_t* stack_limit() const { return stack_limit_; } @@ -7067,9 +7067,9 @@ class V8_EXPORT EmbedderHeapTracer { * Note: Only one of the AdvanceTracing methods needs to be overriden by the * embedder. */ - V8_DEPRECATE_SOON("Use void AdvanceTracing(deadline_in_ms)", - virtual bool AdvanceTracing( - double deadline_in_ms, AdvanceTracingActions actions)) { + V8_DEPRECATED("Use void AdvanceTracing(deadline_in_ms)", + virtual bool AdvanceTracing( + double deadline_in_ms, AdvanceTracingActions actions)) { return false; } @@ -7108,8 +7108,8 @@ class V8_EXPORT EmbedderHeapTracer { * Note: Only one of the EnterFinalPause methods needs to be overriden by the * embedder. */ - V8_DEPRECATE_SOON("Use void EnterFinalPause(EmbedderStackState)", - virtual void EnterFinalPause()) {} + V8_DEPRECATED("Use void EnterFinalPause(EmbedderStackState)", + virtual void EnterFinalPause()) {} virtual void EnterFinalPause(EmbedderStackState stack_state); /**