Skip to content

Commit 4504182

Browse files
mhdawsonjasnell
authored andcommitted
deps: cherry-pick 1ef7487b from v8 upstream
Original commit message: Improved diagnostic message for JS heap out of memory This patch replaces the unused 'take_snapshot' parameter on FatalProcessOutOfMemory() with a 'is_heap_oom' parameter. The parameter is set to true on error paths where the JS heap is out of memory, as distinct from a malloc() failure i.e. process out of memory. The message output to stderr or passed to embedding applications via FatalErrorCallback is 'Javascript heap out of memory' rather than 'process out of memory'. BUG= R=jochen@chromium.org, verwaest@chromium.org, michael_dawson@ca.ibm.com Review URL: https://codereview.chromium.org/1873443002 Cr-Commit-Position: refs/heads/master@{#35431} We'd like this in 6.x to help with diagnosing customer problems. It provides a better message on OOM so that it is easier to be able to tell whether the OOM was due to heap exhaustion or running out of native memory. PR-URL: #6218 Reviewed-By: Ben Noordhuis <ben@strongloop.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 7fd98af commit 4504182

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

deps/v8/src/api.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ void i::FatalProcessOutOfMemory(const char* location) {
226226

227227
// When V8 cannot allocated memory FatalProcessOutOfMemory is called.
228228
// The default fatal error handler is called and execution is stopped.
229-
void i::V8::FatalProcessOutOfMemory(const char* location, bool take_snapshot) {
229+
void i::V8::FatalProcessOutOfMemory(const char* location, bool is_heap_oom) {
230230
i::Isolate* isolate = i::Isolate::Current();
231231
char last_few_messages[Heap::kTraceRingBufferSize + 1];
232232
char js_stacktrace[Heap::kStacktraceBufferSize + 1];
@@ -288,7 +288,9 @@ void i::V8::FatalProcessOutOfMemory(const char* location, bool take_snapshot) {
288288
PrintF("\n<--- Last few GCs --->\n%s\n", first_newline);
289289
PrintF("\n<--- JS stacktrace --->\n%s\n", js_stacktrace);
290290
}
291-
Utils::ApiCheck(false, location, "Allocation failed - process out of memory");
291+
Utils::ApiCheck(false, location, is_heap_oom
292+
? "Allocation failed - JavaScript heap out of memory"
293+
: "Allocation failed - process out of memory");
292294
// If the fatal error handler returns, we stop execution.
293295
FATAL("API fatal error handler returned after process out of memory");
294296
}

deps/v8/src/heap/heap.cc

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3969,8 +3969,7 @@ AllocationResult Heap::AllocateUninitializedFixedDoubleArray(
39693969
AllocationResult Heap::AllocateRawFixedDoubleArray(int length,
39703970
PretenureFlag pretenure) {
39713971
if (length < 0 || length > FixedDoubleArray::kMaxLength) {
3972-
v8::internal::Heap::FatalProcessOutOfMemory("invalid array length",
3973-
kDoubleAligned);
3972+
v8::internal::Heap::FatalProcessOutOfMemory("invalid array length", true);
39743973
}
39753974
int size = FixedDoubleArray::SizeFor(length);
39763975
AllocationSpace space = SelectSpace(pretenure);
@@ -5501,9 +5500,8 @@ void Heap::CompactRetainedMaps(ArrayList* retained_maps) {
55015500
if (new_length != length) retained_maps->SetLength(new_length);
55025501
}
55035502

5504-
5505-
void Heap::FatalProcessOutOfMemory(const char* location, bool take_snapshot) {
5506-
v8::internal::V8::FatalProcessOutOfMemory(location, take_snapshot);
5503+
void Heap::FatalProcessOutOfMemory(const char* location, bool is_heap_oom) {
5504+
v8::internal::V8::FatalProcessOutOfMemory(location, is_heap_oom);
55075505
}
55085506

55095507
#ifdef DEBUG

deps/v8/src/heap/heap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ class Heap {
552552
static inline bool IsOneByte(T t, int chars);
553553

554554
static void FatalProcessOutOfMemory(const char* location,
555-
bool take_snapshot = false);
555+
bool is_heap_oom = false);
556556

557557
static bool RootIsImmortalImmovable(int root_index);
558558

deps/v8/src/heap/mark-compact.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1675,8 +1675,8 @@ class MarkCompactCollector::EvacuateNewSpaceVisitor final
16751675
compaction_spaces_->Get(OLD_SPACE)->AllocateRaw(size_in_bytes,
16761676
alignment);
16771677
if (allocation.IsRetry()) {
1678-
FatalProcessOutOfMemory(
1679-
"MarkCompactCollector: semi-space copy, fallback in old gen\n");
1678+
v8::internal::Heap::FatalProcessOutOfMemory(
1679+
"MarkCompactCollector: semi-space copy, fallback in old gen", true);
16801680
}
16811681
return allocation;
16821682
}

deps/v8/src/v8.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class V8 : public AllStatic {
2121
// Report process out of memory. Implementation found in api.cc.
2222
// This function will not return, but will terminate the execution.
2323
static void FatalProcessOutOfMemory(const char* location,
24-
bool take_snapshot = false);
24+
bool is_heap_oom = false);
2525

2626
static void InitializePlatform(v8::Platform* platform);
2727
static void ShutdownPlatform();

0 commit comments

Comments
 (0)