mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-20 19:14:38 +02:00
6718086: CMS assert: _concurrent_iteration_safe_limit update missed
Initialize the field correctly in ContiguousSpace's constructor and initialize() methods, using the latter for the survivor spaces upon initial construction or a subsequent resizing of the young generation. Add some missing Space sub-class constructors. Reviewed-by: apetrusenko
This commit is contained in:
parent
c201c739e4
commit
b6c292d65d
3 changed files with 12 additions and 3 deletions
|
@ -227,8 +227,8 @@ void DefNewGeneration::compute_space_boundaries(uintx minimum_eden_size) {
|
|||
eden()->mangle_unused_area();
|
||||
}
|
||||
}
|
||||
from()->set_bounds(fromMR); from()->clear();
|
||||
to()->set_bounds(toMR); to()->clear();
|
||||
from()->initialize(fromMR, true /* clear */);
|
||||
to()->initialize( toMR, true /* clear */);
|
||||
// Make sure we compact eden, then from.
|
||||
// The to-space is normally empty before a compaction so need
|
||||
// not be considered. The exception is during promotion
|
||||
|
|
|
@ -276,6 +276,7 @@ void ContiguousSpace::initialize(MemRegion mr, bool clear_space) {
|
|||
set_top(bottom());
|
||||
set_saved_mark();
|
||||
if (clear_space) clear();
|
||||
set_concurrent_iteration_safe_limit(top());
|
||||
}
|
||||
|
||||
void ContiguousSpace::clear() {
|
||||
|
|
|
@ -373,6 +373,9 @@ private:
|
|||
CompactibleSpace* _next_compaction_space;
|
||||
|
||||
public:
|
||||
CompactibleSpace() :
|
||||
_compaction_top(NULL), _next_compaction_space(NULL) {}
|
||||
|
||||
virtual void initialize(MemRegion mr, bool clear_space);
|
||||
virtual void clear();
|
||||
|
||||
|
@ -766,6 +769,10 @@ class ContiguousSpace: public CompactibleSpace {
|
|||
inline HeapWord* par_allocate_impl(size_t word_size, HeapWord* end_value);
|
||||
|
||||
public:
|
||||
ContiguousSpace() :
|
||||
_top(NULL),
|
||||
_concurrent_iteration_safe_limit(NULL) {}
|
||||
|
||||
virtual void initialize(MemRegion mr, bool clear_space);
|
||||
|
||||
// Accessors
|
||||
|
@ -970,7 +977,8 @@ class EdenSpace : public ContiguousSpace {
|
|||
HeapWord* _soft_end;
|
||||
|
||||
public:
|
||||
EdenSpace(DefNewGeneration* gen) : _gen(gen) { _soft_end = NULL; }
|
||||
EdenSpace(DefNewGeneration* gen) :
|
||||
_gen(gen), _soft_end(NULL) {}
|
||||
|
||||
// Get/set just the 'soft' limit.
|
||||
HeapWord* soft_end() { return _soft_end; }
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue