diff -r b2b4df384c83 -r 912c55e702d6 src/hotspot/share/gc/shared/genCollectedHeap.hpp --- a/src/hotspot/share/gc/shared/genCollectedHeap.hpp Fri Nov 10 19:10:54 2017 +0100 +++ b/src/hotspot/share/gc/shared/genCollectedHeap.hpp Thu Nov 30 17:13:33 2017 +0100 @@ -83,6 +83,12 @@ bool run_verification, bool clear_soft_refs, bool restore_marks_for_biased_locking); + // Reserve aligned space for the heap as needed by the contained generations. + char* allocate(size_t alignment, ReservedSpace* heap_rs); + + // Initialize ("weak") refs processing support + void ref_processing_init(); + protected: // The set of potentially parallel tasks in root scanning. @@ -134,31 +140,18 @@ // we absolutely __must__ clear soft refs? bool must_clear_all_soft_refs(); + GenCollectedHeap(GenCollectorPolicy *policy); + + virtual void check_gen_kinds() = 0; + public: - GenCollectedHeap(GenCollectorPolicy *policy); // Returns JNI_OK on success virtual jint initialize(); - // Reserve aligned space for the heap as needed by the contained generations. - char* allocate(size_t alignment, ReservedSpace* heap_rs); - // Does operations required after initialization has been done. void post_initialize(); - virtual void check_gen_kinds(); - - // Initialize ("weak") refs processing support - virtual void ref_processing_init(); - - virtual Name kind() const { - return CollectedHeap::GenCollectedHeap; - } - - virtual const char* name() const { - return "Serial"; - } - Generation* young_gen() const { return _young_gen; } Generation* old_gen() const { return _old_gen; } @@ -215,11 +208,6 @@ // assertion checking or verification only. bool is_in(const void* p) const; - // override - virtual bool is_in_closed_subset(const void* p) const { - return is_in(p); - } - // Returns true if the reference is to an object in the reserved space // for the young generation. // Assumes the the young gen address range is less than that of the old gen. @@ -286,10 +274,6 @@ return true; } - virtual bool card_mark_must_follow_store() const { - return false; - } - // We don't need barriers for stores to objects in the // young gen and, a fortiori, for initializing stores to // objects therein. This applies to DefNew+Tenured and ParNew+CMS