From 59fa7f12571f721bfe2f5952bc7fe415abb3ad1c Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Fri, 21 Dec 2018 15:49:29 -0800 Subject: [PATCH] deps: cherry-pick 26b145a from upstream V8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original commit message: [api] Deprecate ExternalStringResourceBase::IsCompressible R=yangguo@chromium.org Bug: v8:8238 Change-Id: Ia59aefc54c2e9f4fa3348c42fb45e7fadab8ee76 Reviewed-on: https://chromium-review.googlesource.com/c/1349231 Reviewed-by: Yang Guo Commit-Queue: Andreas Haas Cr-Commit-Position: refs/heads/master@{#57788} Refs: https://github.com/v8/v8/commit/26b145ab12993b1585396a3f346b3c3aca093204 PR-URL: https://github.com/nodejs/node/pull/25148 Reviewed-By: Gireesh Punathil Reviewed-By: Michaƫl Zasso Reviewed-By: Colin Ihrig Reviewed-By: James M Snell --- common.gypi | 2 +- deps/v8/include/v8.h | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/common.gypi b/common.gypi index 9c5efa905df..dd4f91484c9 100644 --- a/common.gypi +++ b/common.gypi @@ -38,7 +38,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.7', + 'v8_embedder_string': '-node.8', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/include/v8.h b/deps/v8/include/v8.h index 9b7be9fb930..01fb56b55db 100644 --- a/deps/v8/include/v8.h +++ b/deps/v8/include/v8.h @@ -2631,8 +2631,7 @@ class V8_EXPORT String : public Name { public: virtual ~ExternalStringResourceBase() = default; - V8_DEPRECATE_SOON("Use IsCacheable().", - virtual bool IsCompressible() const) { + V8_DEPRECATED("Use IsCacheable().", virtual bool IsCompressible() const) { return false; } @@ -2641,16 +2640,7 @@ class V8_EXPORT String : public Name { * ExternalStringResource::data() may be cached, otherwise it is not * expected to be stable beyond the current top-level task. */ - virtual bool IsCacheable() const { -#if __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#endif - return !IsCompressible(); -#if __clang__ -#pragma clang diagnostic pop -#endif - } + virtual bool IsCacheable() const { return true; } protected: ExternalStringResourceBase() = default;