archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 11:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8144505: Change G1ParCopyHelper to inherit OopClosure

Browse source 
Reviewed-by: mgerdin, stefank
This commit is contained in:
Stefan Johansson 2015-12-11 17:49:40 +01:00
parent f6440f7fb1
commit 27c56ca8af
3 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
hotspot/src/share/vm/gc/g1/g1OopClosures.cpp
View file

@ -31,7 +31,8 @@
#include "utilities/stack.inline.hpp" #include "utilities/stack.inline.hpp"
G1ParCopyHelper::G1ParCopyHelper(G1CollectedHeap* g1, G1ParScanThreadState* par_scan_state) : G1ParCopyHelper::G1ParCopyHelper(G1CollectedHeap* g1, G1ParScanThreadState* par_scan_state) :
G1ParClosureSuper(g1, par_scan_state), _g1(g1),
_par_scan_state(par_scan_state),
_worker_id(par_scan_state->worker_id()), _worker_id(par_scan_state->worker_id()),
_scanned_klass(NULL), _scanned_klass(NULL),
_cm(_g1->concurrent_mark()) _cm(_g1->concurrent_mark())

14
hotspot/src/share/vm/gc/g1/g1OopClosures.hpp
View file

@ -86,8 +86,10 @@ public:
}; };
// Add back base class for metadata // Add back base class for metadata
class G1ParCopyHelper : public G1ParClosureSuper { class G1ParCopyHelper : public OopClosure {
protected: protected:
G1CollectedHeap* _g1;
G1ParScanThreadState* _par_scan_state;
uint _worker_id; // Cache value from par_scan_state. uint _worker_id; // Cache value from par_scan_state.
Klass* _scanned_klass; Klass* _scanned_klass;
ConcurrentMark* _cm; ConcurrentMark* _cm;
@ -125,13 +127,11 @@ template <G1Barrier barrier, G1Mark do_mark_object, bool use_ext>
class G1ParCopyClosure : public G1ParCopyHelper { class G1ParCopyClosure : public G1ParCopyHelper {
public: public:
G1ParCopyClosure(G1CollectedHeap* g1, G1ParScanThreadState* par_scan_state) : G1ParCopyClosure(G1CollectedHeap* g1, G1ParScanThreadState* par_scan_state) :
G1ParCopyHelper(g1, par_scan_state) { G1ParCopyHelper(g1, par_scan_state) { }
assert(ref_processor() == NULL, "sanity");
}
template <class T> void do_oop_nv(T* p); template <class T> void do_oop_work(T* p);
virtual void do_oop(oop* p) { do_oop_nv(p); } virtual void do_oop(oop* p) { do_oop_work(p); }
virtual void do_oop(narrowOop* p) { do_oop_nv(p); } virtual void do_oop(narrowOop* p) { do_oop_work(p); }
}; };
class G1KlassScanClosure : public KlassClosure { class G1KlassScanClosure : public KlassClosure {

2
hotspot/src/share/vm/gc/g1/g1OopClosures.inline.hpp
View file

@ -256,7 +256,7 @@ void G1ParCopyHelper::mark_forwarded_object(oop from_obj, oop to_obj) {
template <G1Barrier barrier, G1Mark do_mark_object, bool use_ext> template <G1Barrier barrier, G1Mark do_mark_object, bool use_ext>
template <class T> template <class T>
void G1ParCopyClosure<barrier, do_mark_object, use_ext>::do_oop_nv(T* p) { void G1ParCopyClosure<barrier, do_mark_object, use_ext>::do_oop_work(T* p) {
T heap_oop = oopDesc::load_heap_oop(p); T heap_oop = oopDesc::load_heap_oop(p);
if (oopDesc::is_null(heap_oop)) { if (oopDesc::is_null(heap_oop)) {