comparison src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp @ 14909:4ca6dc0799b6

Backout jdk9 merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 01 Apr 2014 13:57:07 +0200
parents f460c6926af7
children 52b4284cb496
comparison
equal deleted inserted replaced
14908:8db6e76cb658 14909:4ca6dc0799b6
27 27
28 #include "gc_implementation/g1/concurrentMark.inline.hpp" 28 #include "gc_implementation/g1/concurrentMark.inline.hpp"
29 #include "gc_implementation/g1/g1CollectedHeap.hpp" 29 #include "gc_implementation/g1/g1CollectedHeap.hpp"
30 #include "gc_implementation/g1/g1OopClosures.hpp" 30 #include "gc_implementation/g1/g1OopClosures.hpp"
31 #include "gc_implementation/g1/g1RemSet.hpp" 31 #include "gc_implementation/g1/g1RemSet.hpp"
32 #include "gc_implementation/g1/g1RemSet.inline.hpp"
33 #include "gc_implementation/g1/heapRegionRemSet.hpp" 32 #include "gc_implementation/g1/heapRegionRemSet.hpp"
34 33
35 /* 34 /*
36 * This really ought to be an inline function, but apparently the C++ 35 * This really ought to be an inline function, but apparently the C++
37 * compiler sometimes sees fit to ignore inline declarations. Sigh. 36 * compiler sometimes sees fit to ignore inline declarations. Sigh.
81 obj->forwardee() == oopDesc::load_decode_heap_oop(p)), 80 obj->forwardee() == oopDesc::load_decode_heap_oop(p)),
82 "p should still be pointing to obj or to its forwardee"); 81 "p should still be pointing to obj or to its forwardee");
83 82
84 _par_scan_state->push_on_queue(p); 83 _par_scan_state->push_on_queue(p);
85 } else { 84 } else {
86 _par_scan_state->update_rs(_from, p, _worker_id); 85 _par_scan_state->update_rs(_from, p, _par_scan_state->queue_num());
87 } 86 }
88 } 87 }
89 } 88 }
90 89
91 template <class T> 90 template <class T>
176 HeapRegion* to = _g1->heap_region_containing(obj); 175 HeapRegion* to = _g1->heap_region_containing(obj);
177 if (to != NULL && _from != to) { 176 if (to != NULL && _from != to) {
178 // The _record_refs_into_cset flag is true during the RSet 177 // The _record_refs_into_cset flag is true during the RSet
179 // updating part of an evacuation pause. It is false at all 178 // updating part of an evacuation pause. It is false at all
180 // other times: 179 // other times:
181 // * rebuilding the remembered sets after a full GC 180 // * rebuilding the rembered sets after a full GC
182 // * during concurrent refinement. 181 // * during concurrent refinement.
183 // * updating the remembered sets of regions in the collection 182 // * updating the remembered sets of regions in the collection
184 // set in the event of an evacuation failure (when deferred 183 // set in the event of an evacuation failure (when deferred
185 // updates are enabled). 184 // updates are enabled).
186 185