src/hotspot/share/gc/g1/g1ConcurrentMark.cpp

rev 53988 : imported patch 8219100-cleanup-young-collection-prologue

*** 732,742 ****
      return false;
    }
  };
  
  void G1ConcurrentMark::pre_initial_mark() {
!   // Initialize marking structures. This has to be done in a STW phase.
    reset();
  
    // For each region note start of marking.
    NoteStartOfMarkHRClosure startcl;
    _g1h->heap_region_iterate(&startcl);
--- 732,744 ----
      return false;
    }
  };
  
  void G1ConcurrentMark::pre_initial_mark() {
!   assert_at_safepoint_on_vm_thread();
! 
!   // Reset marking state.
    reset();
  
    // For each region note start of marking.
    NoteStartOfMarkHRClosure startcl;
    _g1h->heap_region_iterate(&startcl);
*** 1947,1957 ****
                "obj: " PTR_FORMAT " in CSet, phase: %s, info: %d",
                p2i(task_entry.obj()), _phase, _info);
    }
  };
  
! void G1ConcurrentMark::verify_no_cset_oops() {
    assert(SafepointSynchronize::is_at_safepoint(), "should be at a safepoint");
    if (!_g1h->collector_state()->mark_or_rebuild_in_progress()) {
      return;
    }
  
--- 1949,1959 ----
                "obj: " PTR_FORMAT " in CSet, phase: %s, info: %d",
                p2i(task_entry.obj()), _phase, _info);
    }
  };
  
! void G1ConcurrentMark::verify_no_collection_set_oops_in_stacks() {
    assert(SafepointSynchronize::is_at_safepoint(), "should be at a safepoint");
    if (!_g1h->collector_state()->mark_or_rebuild_in_progress()) {
      return;
    }