diff options
| author | Anna Henningsen <anna@addaleax.net> | 2016-07-03 15:51:47 +0200 |
|---|---|---|
| committer | Anna Henningsen <anna@addaleax.net> | 2016-07-07 10:35:28 +0200 |
| commit | 4c774e121bcb612ca00e305915abc5155c85fae1 (patch) | |
| tree | bc7c27045012d88d995316e2177e6ea208420819 /deps | |
| parent | 0f3149eb980f1cc6aca6e6481a042439b7f2a703 (diff) | |
| download | android-node-v8-4c774e121bcb612ca00e305915abc5155c85fae1.tar.gz android-node-v8-4c774e121bcb612ca00e305915abc5155c85fae1.tar.bz2 android-node-v8-4c774e121bcb612ca00e305915abc5155c85fae1.zip | |
deps: remove extra field from v8::HeapStatistics
Remove the `_malloced_memory` field from the `HeapStatistics`
class to achieve full ABI compatibility with V8 5.0.
Ref: https://github.com/nodejs/node/pull/7016
PR-URL: https://github.com/nodejs/node/pull/7526
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/v8/include/v8.h | 2 | ||||
| -rw-r--r-- | deps/v8/src/api.cc | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/deps/v8/include/v8.h b/deps/v8/include/v8.h index ad2e5f60c2..2c23995439 100644 --- a/deps/v8/include/v8.h +++ b/deps/v8/include/v8.h @@ -5202,7 +5202,6 @@ class V8_EXPORT HeapStatistics { size_t total_available_size() { return total_available_size_; } size_t used_heap_size() { return used_heap_size_; } size_t heap_size_limit() { return heap_size_limit_; } - size_t malloced_memory() { return malloced_memory_; } size_t does_zap_garbage() { return does_zap_garbage_; } private: @@ -5213,7 +5212,6 @@ class V8_EXPORT HeapStatistics { size_t used_heap_size_; size_t heap_size_limit_; bool does_zap_garbage_; - size_t malloced_memory_; friend class V8; friend class Isolate; diff --git a/deps/v8/src/api.cc b/deps/v8/src/api.cc index dc954d3f14..f0045cdb96 100644 --- a/deps/v8/src/api.cc +++ b/deps/v8/src/api.cc @@ -5526,8 +5526,7 @@ HeapStatistics::HeapStatistics() total_available_size_(0), used_heap_size_(0), heap_size_limit_(0), - does_zap_garbage_(0), - malloced_memory_(0) {} + does_zap_garbage_(0) {} HeapSpaceStatistics::HeapSpaceStatistics(): space_name_(0), space_size_(0), @@ -7428,8 +7427,6 @@ void Isolate::GetHeapStatistics(HeapStatistics* heap_statistics) { heap_statistics->total_available_size_ = heap->Available(); heap_statistics->used_heap_size_ = heap->SizeOfObjects(); heap_statistics->heap_size_limit_ = heap->MaxReserved(); - heap_statistics->malloced_memory_ = - isolate->allocator()->GetCurrentMemoryUsage(); heap_statistics->does_zap_garbage_ = heap->ShouldZapGarbage(); } |