Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(272)

Side by Side Diff: src/store-buffer.cc

Issue 416403011: Fix bogus assert in HeapIterator. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/spaces.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "src/store-buffer.h" 5 #include "src/store-buffer.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "src/v8.h" 9 #include "src/v8.h"
10 10
(...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 heap_object = iterator.Next()) { 498 heap_object = iterator.Next()) {
499 // We skip free space objects. 499 // We skip free space objects.
500 if (!heap_object->IsFiller()) { 500 if (!heap_object->IsFiller()) {
501 FindPointersToNewSpaceInRegion( 501 FindPointersToNewSpaceInRegion(
502 heap_object->address() + HeapObject::kHeaderSize, 502 heap_object->address() + HeapObject::kHeaderSize,
503 heap_object->address() + heap_object->Size(), slot_callback, 503 heap_object->address() + heap_object->Size(), slot_callback,
504 clear_maps); 504 clear_maps);
505 } 505 }
506 } 506 }
507 } else { 507 } else {
508 if (page->parallel_sweeping() > MemoryChunk::SWEEPING_FINALIZE) { 508 if (!page->SweepingCompleted()) {
509 heap_->mark_compact_collector()->SweepInParallel(page, owner); 509 heap_->mark_compact_collector()->SweepInParallel(page, owner);
510 if (page->parallel_sweeping() > MemoryChunk::SWEEPING_FINALIZE) { 510 if (!page->SweepingCompleted()) {
511 // We were not able to sweep that page, i.e., a concurrent 511 // We were not able to sweep that page, i.e., a concurrent
512 // sweeper thread currently owns this page. 512 // sweeper thread currently owns this page.
513 // TODO(hpayer): This may introduce a huge pause here. We 513 // TODO(hpayer): This may introduce a huge pause here. We
514 // just care about finish sweeping of the scan on scavenge page. 514 // just care about finish sweeping of the scan on scavenge page.
515 heap_->mark_compact_collector()->EnsureSweepingCompleted(); 515 heap_->mark_compact_collector()->EnsureSweepingCompleted();
516 } 516 }
517 } 517 }
518 // TODO(hpayer): remove the special casing and merge map and pointer 518 // TODO(hpayer): remove the special casing and merge map and pointer
519 // space handling as soon as we removed conservative sweeping. 519 // space handling as soon as we removed conservative sweeping.
520 CHECK(page->owner() == heap_->old_pointer_space()); 520 CHECK(page->owner() == heap_->old_pointer_space());
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
592 } 592 }
593 old_buffer_is_sorted_ = false; 593 old_buffer_is_sorted_ = false;
594 old_buffer_is_filtered_ = false; 594 old_buffer_is_filtered_ = false;
595 *old_top_++ = reinterpret_cast<Address>(int_addr << kPointerSizeLog2); 595 *old_top_++ = reinterpret_cast<Address>(int_addr << kPointerSizeLog2);
596 ASSERT(old_top_ <= old_limit_); 596 ASSERT(old_top_ <= old_limit_);
597 } 597 }
598 heap_->isolate()->counters()->store_buffer_compactions()->Increment(); 598 heap_->isolate()->counters()->store_buffer_compactions()->Increment();
599 } 599 }
600 600
601 } } // namespace v8::internal 601 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/spaces.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698