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

*** 26,10 ***
--- 26,11 ---
  #include "precompiled.hpp"
  #include "memory/allocation.hpp"
  #include "memory/universe.hpp"
  
  #include "gc/shared/gcArguments.hpp"
+ #include "gc/shared/gcForwarding.hpp"
  #include "gc/shared/gcTimer.hpp"
  #include "gc/shared/gcTraceTime.inline.hpp"
  #include "gc/shared/locationPrinter.inline.hpp"
  #include "gc/shared/memAllocator.hpp"
  #include "gc/shared/plab.hpp"

*** 437,10 ***
--- 438,12 ---
  
    _control_thread = new ShenandoahControlThread();
  
    ShenandoahInitLogger::print();
  
+   GCForwarding::initialize(_heap_region, ShenandoahHeapRegion::region_size_words());
+ 
    return JNI_OK;
  }
  
  void ShenandoahHeap::initialize_mode() {
    if (ShenandoahGCMode != nullptr) {

*** 988,11 ***
    ShenandoahConcurrentEvacuateRegionObjectClosure(ShenandoahHeap* heap) :
      _heap(heap), _thread(Thread::current()) {}
  
    void do_object(oop p) {
      shenandoah_assert_marked(nullptr, p);
!     if (!p->is_forwarded()) {
        _heap->evacuate_object(p, _thread);
      }
    }
  };
  
--- 991,11 ---
    ShenandoahConcurrentEvacuateRegionObjectClosure(ShenandoahHeap* heap) :
      _heap(heap), _thread(Thread::current()) {}
  
    void do_object(oop p) {
      shenandoah_assert_marked(nullptr, p);
!     if (!ShenandoahForwarding::is_forwarded(p)) {
        _heap->evacuate_object(p, _thread);
      }
    }
  };
  

*** 1333,10 ***
--- 1336,11 ---
  
    // Work through the oop stack to traverse heap
    while (! oop_stack.is_empty()) {
      oop obj = oop_stack.pop();
      assert(oopDesc::is_oop(obj), "must be a valid oop");
+     shenandoah_assert_not_in_cset_except(NULL, obj, cancelled_gc());
      cl->do_object(obj);
      obj->oop_iterate(&oops);
    }
  
    assert(oop_stack.is_empty(), "should be empty");