From 5245d6ac971174965ccdc7a9bf4c6cd8b13db454 Mon Sep 17 00:00:00 2001 From: Ali Ijaz Sheikh Date: Mon, 19 Nov 2018 11:56:12 -0800 Subject: [PATCH] deps: V8: partially revert d868eb7 d868eb7 ended up being an inadvertant ABI change. Remove the call to CheckMemoryPressure from the header itself. PR-URL: https://github.com/nodejs/node/pull/24499 Reviewed-By: Anna Henningsen Reviewed-By: Yang Guo Reviewed-By: Myles Borins --- deps/v8/include/v8-version.h | 2 +- deps/v8/include/v8.h | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/deps/v8/include/v8-version.h b/deps/v8/include/v8-version.h index 43abf735d38d3e..73d98b3a9ba8f2 100644 --- a/deps/v8/include/v8-version.h +++ b/deps/v8/include/v8-version.h @@ -11,7 +11,7 @@ #define V8_MAJOR_VERSION 6 #define V8_MINOR_VERSION 2 #define V8_BUILD_NUMBER 414 -#define V8_PATCH_LEVEL 70 +#define V8_PATCH_LEVEL 71 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) diff --git a/deps/v8/include/v8.h b/deps/v8/include/v8.h index d964675407deb1..eaf1e5b5ca2485 100644 --- a/deps/v8/include/v8.h +++ b/deps/v8/include/v8.h @@ -10247,28 +10247,15 @@ uint32_t Isolate::GetNumberOfDataSlots() { int64_t Isolate::AdjustAmountOfExternalAllocatedMemory( int64_t change_in_bytes) { - const int64_t kMemoryReducerActivationLimit = 1024 * 1024; typedef internal::Internals I; int64_t* external_memory = reinterpret_cast( reinterpret_cast(this) + I::kExternalMemoryOffset); int64_t* external_memory_limit = reinterpret_cast( reinterpret_cast(this) + I::kExternalMemoryLimitOffset); - int64_t* external_memory_at_last_mc = - reinterpret_cast(reinterpret_cast(this) + - I::kExternalMemoryAtLastMarkCompactOffset); const int64_t amount = *external_memory + change_in_bytes; *external_memory = amount; - int64_t allocation_diff_since_last_mc = - *external_memory_at_last_mc - *external_memory; - allocation_diff_since_last_mc = allocation_diff_since_last_mc < 0 - ? -allocation_diff_since_last_mc - : allocation_diff_since_last_mc; - if (allocation_diff_since_last_mc > kMemoryReducerActivationLimit) { - CheckMemoryPressure(); - } - if (change_in_bytes < 0) { *external_memory_limit += change_in_bytes; }