| OLD | NEW |
| 1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 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/heap/mark-compact.h" | 5 #include "src/heap/mark-compact.h" |
| 6 | 6 |
| 7 #include "src/base/atomicops.h" | 7 #include "src/base/atomicops.h" |
| 8 #include "src/base/bits.h" | 8 #include "src/base/bits.h" |
| 9 #include "src/base/sys-info.h" | 9 #include "src/base/sys-info.h" |
| 10 #include "src/code-stubs.h" | 10 #include "src/code-stubs.h" |
| (...skipping 783 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 794 EnsureSweepingCompleted(); | 794 EnsureSweepingCompleted(); |
| 795 } | 795 } |
| 796 | 796 |
| 797 // If concurrent unmapping tasks are still running, we should wait for | 797 // If concurrent unmapping tasks are still running, we should wait for |
| 798 // them here. | 798 // them here. |
| 799 heap()->memory_allocator()->unmapper()->WaitUntilCompleted(); | 799 heap()->memory_allocator()->unmapper()->WaitUntilCompleted(); |
| 800 | 800 |
| 801 // Clear marking bits if incremental marking is aborted. | 801 // Clear marking bits if incremental marking is aborted. |
| 802 if (was_marked_incrementally_ && heap_->ShouldAbortIncrementalMarking()) { | 802 if (was_marked_incrementally_ && heap_->ShouldAbortIncrementalMarking()) { |
| 803 heap()->incremental_marking()->Stop(); | 803 heap()->incremental_marking()->Stop(); |
| 804 heap()->incremental_marking()->AbortBlackAllocation(); |
| 804 ClearMarkbits(); | 805 ClearMarkbits(); |
| 805 AbortWeakCollections(); | 806 AbortWeakCollections(); |
| 806 AbortWeakCells(); | 807 AbortWeakCells(); |
| 807 AbortTransitionArrays(); | 808 AbortTransitionArrays(); |
| 808 AbortCompaction(); | 809 AbortCompaction(); |
| 809 if (heap_->UsingEmbedderHeapTracer()) { | 810 if (heap_->UsingEmbedderHeapTracer()) { |
| 810 heap_->mark_compact_collector()->embedder_heap_tracer()->AbortTracing(); | 811 heap_->mark_compact_collector()->embedder_heap_tracer()->AbortTracing(); |
| 811 } | 812 } |
| 812 was_marked_incrementally_ = false; | 813 was_marked_incrementally_ = false; |
| 813 } | 814 } |
| (...skipping 3226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4040 // The target is always in old space, we don't have to record the slot in | 4041 // The target is always in old space, we don't have to record the slot in |
| 4041 // the old-to-new remembered set. | 4042 // the old-to-new remembered set. |
| 4042 DCHECK(!heap()->InNewSpace(target)); | 4043 DCHECK(!heap()->InNewSpace(target)); |
| 4043 RecordRelocSlot(host, &rinfo, target); | 4044 RecordRelocSlot(host, &rinfo, target); |
| 4044 } | 4045 } |
| 4045 } | 4046 } |
| 4046 } | 4047 } |
| 4047 | 4048 |
| 4048 } // namespace internal | 4049 } // namespace internal |
| 4049 } // namespace v8 | 4050 } // namespace v8 |
| OLD | NEW |