src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp

rev 59887 : imported patch purge-oom-handler.patch
rev 59888 : imported patch evac-locking.patch

*** 39,48 ****
--- 39,49 ----
  #include "gc/shenandoah/shenandoahCollectionSet.hpp"
  #include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
  #include "gc/shenandoah/shenandoahConcurrentMark.inline.hpp"
  #include "gc/shenandoah/shenandoahConcurrentRoots.hpp"
  #include "gc/shenandoah/shenandoahControlThread.hpp"
+ #include "gc/shenandoah/shenandoahEvacLockingBitmap.hpp"
  #include "gc/shenandoah/shenandoahFreeSet.hpp"
  #include "gc/shenandoah/shenandoahPhaseTimings.hpp"
  #include "gc/shenandoah/shenandoahHeap.inline.hpp"
  #include "gc/shenandoah/shenandoahHeapRegion.inline.hpp"
  #include "gc/shenandoah/shenandoahHeapRegionSet.hpp"
*** 257,266 ****
--- 258,269 ----
                                "Cannot commit bitmap memory");
    }
  
    _marking_context = new ShenandoahMarkingContext(_heap_region, _bitmap_region, _num_regions);
  
+   _evac_locking_bitmap = new ShenandoahEvacLockingBitmap(_heap_region);
+ 
    if (ShenandoahVerify) {
      ReservedSpace verify_bitmap(_bitmap_size, bitmap_page_size);
      if (!verify_bitmap.special()) {
        os::commit_memory_or_exit(verify_bitmap.base(), verify_bitmap.size(), bitmap_page_size, false,
                                  "Cannot commit verification bitmap memory");
*** 493,503 ****
    _bitmap_regions_per_slice(0),
    _bitmap_bytes_per_slice(0),
    _bitmap_region_special(false),
    _aux_bitmap_region_special(false),
    _liveness_cache(NULL),
!   _collection_set(NULL)
  {
    _heap = this;
  
    BarrierSet::set_barrier_set(new ShenandoahBarrierSet(this));
  
--- 496,507 ----
    _bitmap_regions_per_slice(0),
    _bitmap_bytes_per_slice(0),
    _bitmap_region_special(false),
    _aux_bitmap_region_special(false),
    _liveness_cache(NULL),
!   _collection_set(NULL),
!   _evac_locking_bitmap(NULL)
  {
    _heap = this;
  
    BarrierSet::set_barrier_set(new ShenandoahBarrierSet(this));