Mercurial > hg > truffle
comparison src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp @ 13086:096c224171c4
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 20 Nov 2013 00:10:38 +0100 |
parents | cefad50507d8 69944b868a32 |
children | d8041d695d19 |
comparison
equal
deleted
inserted
replaced
12782:92b7ec34ddfa | 13086:096c224171c4 |
---|---|
27 | 27 |
28 #include "gc_implementation/g1/concurrentMark.hpp" | 28 #include "gc_implementation/g1/concurrentMark.hpp" |
29 #include "gc_implementation/g1/g1CollectedHeap.hpp" | 29 #include "gc_implementation/g1/g1CollectedHeap.hpp" |
30 #include "gc_implementation/g1/g1AllocRegion.inline.hpp" | 30 #include "gc_implementation/g1/g1AllocRegion.inline.hpp" |
31 #include "gc_implementation/g1/g1CollectorPolicy.hpp" | 31 #include "gc_implementation/g1/g1CollectorPolicy.hpp" |
32 #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" | |
32 #include "gc_implementation/g1/heapRegionSeq.inline.hpp" | 33 #include "gc_implementation/g1/heapRegionSeq.inline.hpp" |
33 #include "utilities/taskqueue.hpp" | 34 #include "utilities/taskqueue.hpp" |
34 | 35 |
35 // Inline functions for G1CollectedHeap | 36 // Inline functions for G1CollectedHeap |
36 | 37 |
132 | 133 |
133 HeapWord* end = start + word_size; | 134 HeapWord* end = start + word_size; |
134 assert(containing_hr->is_in(end - 1), "it should also contain end - 1"); | 135 assert(containing_hr->is_in(end - 1), "it should also contain end - 1"); |
135 | 136 |
136 MemRegion mr(start, end); | 137 MemRegion mr(start, end); |
137 g1_barrier_set()->dirty(mr); | 138 g1_barrier_set()->g1_mark_as_young(mr); |
138 } | 139 } |
139 | 140 |
140 inline RefToScanQueue* G1CollectedHeap::task_queue(int i) const { | 141 inline RefToScanQueue* G1CollectedHeap::task_queue(int i) const { |
141 return _task_queues->queue(i); | 142 return _task_queues->queue(i); |
142 } | 143 } |