Skip to content

Commit 9a4b338

Browse files
addaleaxofrobots
authored andcommitted
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: #7016 PR-URL: #7526 Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 2c46e23 commit 9a4b338

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

deps/v8/include/v8.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5211,7 +5211,6 @@ class V8_EXPORT HeapStatistics {
52115211
size_t total_available_size() { return total_available_size_; }
52125212
size_t used_heap_size() { return used_heap_size_; }
52135213
size_t heap_size_limit() { return heap_size_limit_; }
5214-
size_t malloced_memory() { return malloced_memory_; }
52155214
size_t does_zap_garbage() { return does_zap_garbage_; }
52165215

52175216
private:
@@ -5222,7 +5221,6 @@ class V8_EXPORT HeapStatistics {
52225221
size_t used_heap_size_;
52235222
size_t heap_size_limit_;
52245223
bool does_zap_garbage_;
5225-
size_t malloced_memory_;
52265224

52275225
friend class V8;
52285226
friend class Isolate;

deps/v8/src/api.cc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5544,8 +5544,7 @@ HeapStatistics::HeapStatistics()
55445544
total_available_size_(0),
55455545
used_heap_size_(0),
55465546
heap_size_limit_(0),
5547-
does_zap_garbage_(0),
5548-
malloced_memory_(0) {}
5547+
does_zap_garbage_(0) {}
55495548

55505549
HeapSpaceStatistics::HeapSpaceStatistics(): space_name_(0),
55515550
space_size_(0),
@@ -7446,8 +7445,6 @@ void Isolate::GetHeapStatistics(HeapStatistics* heap_statistics) {
74467445
heap_statistics->total_available_size_ = heap->Available();
74477446
heap_statistics->used_heap_size_ = heap->SizeOfObjects();
74487447
heap_statistics->heap_size_limit_ = heap->MaxReserved();
7449-
heap_statistics->malloced_memory_ =
7450-
isolate->allocator()->GetCurrentMemoryUsage();
74517448
heap_statistics->does_zap_garbage_ = heap->ShouldZapGarbage();
74527449
}
74537450

0 commit comments

Comments
 (0)