Merge
This commit is contained in:
commit
a551d5bf05
@ -84,8 +84,11 @@ template <class T> inline void G1ParScanClosure::do_oop_nv(T* p) {
|
||||
// slightly paranoid test; I'm trying to catch potential
|
||||
// problems before we go into push_on_queue to know where the
|
||||
// problem is coming from
|
||||
assert(obj == oopDesc::load_decode_heap_oop(p),
|
||||
"p should still be pointing to obj");
|
||||
assert((obj == oopDesc::load_decode_heap_oop(p)) ||
|
||||
(obj->is_forwarded() &&
|
||||
obj->forwardee() == oopDesc::load_decode_heap_oop(p)),
|
||||
"p should still be pointing to obj or to its forwardee");
|
||||
|
||||
_par_scan_state->push_on_queue(p);
|
||||
} else {
|
||||
_par_scan_state->update_rs(_from, p, _par_scan_state->queue_num());
|
||||
|
Loading…
Reference in New Issue
Block a user