equal
deleted
inserted
replaced
105 template <class T> |
105 template <class T> |
106 inline static void check_obj_during_refinement(T* p, oop const obj) { |
106 inline static void check_obj_during_refinement(T* p, oop const obj) { |
107 #ifdef ASSERT |
107 #ifdef ASSERT |
108 G1CollectedHeap* g1 = G1CollectedHeap::heap(); |
108 G1CollectedHeap* g1 = G1CollectedHeap::heap(); |
109 // can't do because of races |
109 // can't do because of races |
110 // assert(obj == NULL || obj->is_oop(), "expected an oop"); |
110 // assert(oopDesc::is_oop_or_null(obj), "expected an oop"); |
111 assert(check_obj_alignment(obj), "not oop aligned"); |
111 assert(check_obj_alignment(obj), "not oop aligned"); |
112 assert(g1->is_in_reserved(obj), "must be in heap"); |
112 assert(g1->is_in_reserved(obj), "must be in heap"); |
113 |
113 |
114 HeapRegion* from = g1->heap_region_containing(p); |
114 HeapRegion* from = g1->heap_region_containing(p); |
115 |
115 |