< prev index next >

src/hotspot/share/gc/g1/g1CodeBlobClosure.cpp

Print this page

        

*** 26,43 **** #include "code/nmethod.hpp" #include "gc/g1/g1CodeBlobClosure.hpp" #include "gc/g1/g1CollectedHeap.inline.hpp" #include "gc/g1/heapRegion.hpp" #include "gc/g1/heapRegionRemSet.hpp" #include "oops/oop.inline.hpp" template <typename T> void G1CodeBlobClosure::HeapRegionGatheringOopClosure::do_oop_work(T* p) { _work->do_oop(p); ! T oop_or_narrowoop = oopDesc::load_heap_oop(p); ! if (!oopDesc::is_null(oop_or_narrowoop)) { ! oop o = oopDesc::decode_heap_oop_not_null(oop_or_narrowoop); HeapRegion* hr = _g1h->heap_region_containing(o); assert(!_g1h->is_in_cset(o) || hr->rem_set()->strong_code_roots_list_contains(_nm), "if o still in collection set then evacuation failed and nm must already be in the remset"); hr->add_strong_code_root(_nm); } } --- 26,45 ---- #include "code/nmethod.hpp" #include "gc/g1/g1CodeBlobClosure.hpp" #include "gc/g1/g1CollectedHeap.inline.hpp" #include "gc/g1/heapRegion.hpp" #include "gc/g1/heapRegionRemSet.hpp" + #include "oops/access.inline.hpp" + #include "oops/compressedOops.inline.hpp" #include "oops/oop.inline.hpp" template <typename T> void G1CodeBlobClosure::HeapRegionGatheringOopClosure::do_oop_work(T* p) { _work->do_oop(p); ! T oop_or_narrowoop = RawAccess<>::oop_load(p); ! if (!CompressedOops::is_null(oop_or_narrowoop)) { ! oop o = CompressedOops::decode_not_null(oop_or_narrowoop); HeapRegion* hr = _g1h->heap_region_containing(o); assert(!_g1h->is_in_cset(o) || hr->rem_set()->strong_code_roots_list_contains(_nm), "if o still in collection set then evacuation failed and nm must already be in the remset"); hr->add_strong_code_root(_nm); } }
< prev index next >