Skip to content

Commit

Permalink
deps: backport e7cc609 from upstream V8
Browse files Browse the repository at this point in the history
This is part 1/2 of the fixes from v8:4871. This fixes a segfault in
verify-heap.

Original commit message:
  [crankshaft] Write fillers for folded old space allocations during verify-heap

  If we don't write fillers, we crash during PagedSpace verification when we try
  to iterate over dead memory (unused folded allocation slots).

  BUG=v8:4871,chromium:580959
  LOG=N

  Review URL: https://codereview.chromium.org/1837163002

  Cr-Commit-Position: refs/heads/master@{#35097}

Fixes: nodejs#5900
V8-Bug: https://bugs.chromium.org/p/v8/issues/detail?id=4871
  • Loading branch information
ofrobots committed Jun 15, 2016
1 parent e2ccf62 commit 24df094
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions deps/v8/src/hydrogen-instructions.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3825,12 +3825,12 @@ bool HAllocate::HandleSideEffectDominator(GVNFlag side_effect,
}
}

bool keep_new_space_iterable = FLAG_log_gc || FLAG_heap_stats;
bool keep_heap_iterable = FLAG_log_gc || FLAG_heap_stats;
#ifdef VERIFY_HEAP
keep_new_space_iterable = keep_new_space_iterable || FLAG_verify_heap;
keep_heap_iterable = keep_heap_iterable || FLAG_verify_heap;
#endif

if (keep_new_space_iterable && dominator_allocate->IsNewSpaceAllocation()) {
if (keep_heap_iterable) {
dominator_allocate->MakePrefillWithFiller();
} else {
// TODO(hpayer): This is a short-term hack to make allocation mementos
Expand Down

0 comments on commit 24df094

Please sign in to comment.