From a00bf96e9deb8765ffd2f27fc581194d32abcb6e Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Thu, 14 Jul 2016 14:22:08 -0400 Subject: [PATCH] deps: port d9e9d9f to deps/v8z MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original commit message: deps: backport e7cc609 from upstream V8 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: https://github.com/nodejs/node/issues/5900 V8-Bug: https://bugs.chromium.org/p/v8/issues/detail?id=4871 PR-URL: https://github.com/nodejs/node/pull/7303 Reviewed-By: Michaël Zasso Reviewed-By: Ben Noordhuis Reviewed-By: Fedor Indutny Reviewed-By: Myles Borins --- deps/v8z/src/hydrogen-instructions.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deps/v8z/src/hydrogen-instructions.cc b/deps/v8z/src/hydrogen-instructions.cc index 24216e0a1b47..79bc978765ce 100644 --- a/deps/v8z/src/hydrogen-instructions.cc +++ b/deps/v8z/src/hydrogen-instructions.cc @@ -3827,12 +3827,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