Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -800,13 +800,13 @@ class ShenandoahGenerationalUpdateHeapRefsTask : public WorkerTask {
template<class T>
void update_references_in_remembered_set(uint worker_id, T &cl, const ShenandoahMarkingContext* ctx, bool is_mixed) {

struct ShenandoahRegionChunk assignment;
ShenandoahRegionChunk assignment;
ShenandoahScanRemembered* scanner = _heap->old_generation()->card_scan();

while (!_heap->check_cancelled_gc_and_yield(CONCURRENT) && _work_chunks->next(&assignment)) {
// Keep grabbing next work chunk to process until finished, or asked to yield
ShenandoahHeapRegion* r = assignment._r;
if (r->is_active() && !r->is_cset() && r->is_old()) {
if (r != nullptr && r->is_active() && !r->is_cset() && r->is_old()) {
HeapWord* start_of_range = r->bottom() + assignment._chunk_offset;
HeapWord* end_of_range = r->get_update_watermark();
if (end_of_range > start_of_range + assignment._chunk_size) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ inline bool ShenandoahRegionChunkIterator::has_next() const {
return _index.load_relaxed() < _total_chunks;
}

inline bool ShenandoahRegionChunkIterator::next(struct ShenandoahRegionChunk *assignment) {
inline bool ShenandoahRegionChunkIterator::next(ShenandoahRegionChunk* assignment) {
if (_index.load_relaxed() >= _total_chunks) {
return false;
}
Expand Down