diff options
author | Michaël Zasso <targos@protonmail.com> | 2018-03-07 08:54:53 +0100 |
---|---|---|
committer | Michaël Zasso <targos@protonmail.com> | 2018-03-07 16:48:52 +0100 |
commit | 88786fecff336342a56e6f2e7ff3b286be716e47 (patch) | |
tree | 92e6ba5b8ac8dae1a058988d20c9d27bfa654390 /deps/v8/test/cctest/test-allocation.cc | |
parent | 4e86f9b5ab83cbabf43839385bf383e6a7ef7d19 (diff) | |
download | node-new-88786fecff336342a56e6f2e7ff3b286be716e47.tar.gz |
deps: update V8 to 6.5.254.31
PR-URL: https://github.com/nodejs/node/pull/18453
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Yang Guo <yangguo@chromium.org>
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Diffstat (limited to 'deps/v8/test/cctest/test-allocation.cc')
-rw-r--r-- | deps/v8/test/cctest/test-allocation.cc | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/deps/v8/test/cctest/test-allocation.cc b/deps/v8/test/cctest/test-allocation.cc index b1a3bef421..139829dd2b 100644 --- a/deps/v8/test/cctest/test-allocation.cc +++ b/deps/v8/test/cctest/test-allocation.cc @@ -4,6 +4,12 @@ #include <stdlib.h> #include <string.h> +#if V8_OS_POSIX +#include <setjmp.h> +#include <signal.h> +#include <unistd.h> // NOLINT +#endif + #include "src/v8.h" #include "test/cctest/cctest.h" @@ -35,6 +41,11 @@ class AllocationPlatform : public TestPlatform { void OnCriticalMemoryPressure() override { oom_callback_called = true; } + bool OnCriticalMemoryPressure(size_t length) override { + oom_callback_called = true; + return true; + } + static AllocationPlatform* current_platform; bool oom_callback_called = false; }; @@ -54,7 +65,7 @@ size_t GetHugeMemoryAmount() { static size_t huge_memory = 0; if (!huge_memory) { for (int i = 0; i < 100; i++) { - huge_memory |= bit_cast<size_t>(v8::base::OS::GetRandomMmapAddr()); + huge_memory |= bit_cast<size_t>(v8::internal::GetRandomMmapAddr()); } // Make it larger than the available address space. huge_memory *= 2; @@ -122,7 +133,7 @@ TEST(AlignedAllocOOM) { // On failure, this won't return, since an AlignedAlloc failure is fatal. // In that case, behavior is checked in OnAlignedAllocOOM before exit. void* result = v8::internal::AlignedAlloc(GetHugeMemoryAmount(), - v8::base::OS::AllocatePageSize()); + v8::internal::AllocatePageSize()); // On a few systems, allocation somehow succeeds. CHECK_EQ(result == nullptr, platform.oom_callback_called); } @@ -143,7 +154,7 @@ TEST(AlignedAllocVirtualMemoryOOM) { CHECK(!platform.oom_callback_called); v8::internal::VirtualMemory result; bool success = v8::internal::AlignedAllocVirtualMemory( - GetHugeMemoryAmount(), v8::base::OS::AllocatePageSize(), nullptr, + GetHugeMemoryAmount(), v8::internal::AllocatePageSize(), nullptr, &result); // On a few systems, allocation somehow succeeds. CHECK_IMPLIES(success, result.IsReserved()); |