Mercurial > hg > truffle
comparison src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp @ 17805:bbfbe9b06038
Merge
author | kvn |
---|---|
date | Thu, 13 Mar 2014 14:57:01 -0700 |
parents | d2907f74462e 86b64209f715 |
children | 78bbf4d43a14 |
comparison
equal
deleted
inserted
replaced
17804:fd1b9f02cc91 | 17805:bbfbe9b06038 |
---|---|
81 obj->forwardee() == oopDesc::load_decode_heap_oop(p)), | 81 obj->forwardee() == oopDesc::load_decode_heap_oop(p)), |
82 "p should still be pointing to obj or to its forwardee"); | 82 "p should still be pointing to obj or to its forwardee"); |
83 | 83 |
84 _par_scan_state->push_on_queue(p); | 84 _par_scan_state->push_on_queue(p); |
85 } else { | 85 } else { |
86 _par_scan_state->update_rs(_from, p, _par_scan_state->queue_num()); | 86 _par_scan_state->update_rs(_from, p, _worker_id); |
87 } | 87 } |
88 } | 88 } |
89 } | 89 } |
90 | 90 |
91 template <class T> | 91 template <class T> |