| Index: src/api.cc
|
| diff --git a/src/api.cc b/src/api.cc
|
| index a2cf7142bc8e940a458faf118d19fdada04d104e..171979cc84dfb8ed344139ca48d895b3f947e025 100644
|
| --- a/src/api.cc
|
| +++ b/src/api.cc
|
| @@ -3961,6 +3961,15 @@ HeapStatistics::HeapStatistics(): total_heap_size_(0),
|
|
|
|
|
| void v8::V8::GetHeapStatistics(HeapStatistics* heap_statistics) {
|
| + if (!i::Isolate::Current()->IsInitialized()) {
|
| + // Isolate is unitialized thus heap is not configured yet.
|
| + heap_statistics->set_total_heap_size(0);
|
| + heap_statistics->set_total_heap_size_executable(0);
|
| + heap_statistics->set_used_heap_size(0);
|
| + heap_statistics->set_heap_size_limit(0);
|
| + return;
|
| + }
|
| +
|
| i::Heap* heap = i::Isolate::Current()->heap();
|
| heap_statistics->set_total_heap_size(heap->CommittedMemory());
|
| heap_statistics->set_total_heap_size_executable(
|
|
|