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

rev 55608 : Rename ShenandoahBrooksPointer to ShenandoahForwarding
rev 55609 : Eliminate extra forwarding pointer per object

*** 24,34 ****
  #include "precompiled.hpp"
  #include "gc/shenandoah/shenandoahAsserts.hpp"
  #include "gc/shenandoah/shenandoahBarrierSet.hpp"
  #include "gc/shenandoah/shenandoahBarrierSetAssembler.hpp"
  #include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
- #include "gc/shenandoah/shenandoahForwarding.hpp"
  #include "gc/shenandoah/shenandoahHeap.inline.hpp"
  #include "gc/shenandoah/shenandoahHeuristics.hpp"
  #include "gc/shenandoah/shenandoahTraversalGC.hpp"
  #include "memory/iterator.inline.hpp"
  #include "runtime/interfaceSupport.inline.hpp"
--- 24,33 ----
*** 260,278 ****
                                        _heap->marking_context() : _heap->complete_marking_context();
  
        ShenandoahHeapRegion* r = _heap->heap_region_containing(obj);
        assert(r->is_cset(), "sanity");
  
!       HeapWord* cur = (HeapWord*)obj + obj->size() + ShenandoahForwarding::word_size();
  
        size_t count = 0;
        while ((cur < r->top()) && ctx->is_marked(oop(cur)) && (count++ < max)) {
          oop cur_oop = oop(cur);
          if (oopDesc::equals_raw(cur_oop, resolve_forwarded_not_null(cur_oop))) {
            _heap->evacuate_object(cur_oop, thread);
          }
!         cur = cur + cur_oop->size() + ShenandoahForwarding::word_size();
        }
      }
  
      return res_oop;
    }
--- 259,277 ----
                                        _heap->marking_context() : _heap->complete_marking_context();
  
        ShenandoahHeapRegion* r = _heap->heap_region_containing(obj);
        assert(r->is_cset(), "sanity");
  
!       HeapWord* cur = (HeapWord*)obj + obj->size();
  
        size_t count = 0;
        while ((cur < r->top()) && ctx->is_marked(oop(cur)) && (count++ < max)) {
          oop cur_oop = oop(cur);
          if (oopDesc::equals_raw(cur_oop, resolve_forwarded_not_null(cur_oop))) {
            _heap->evacuate_object(cur_oop, thread);
          }
!         cur = cur + cur_oop->size();
        }
      }
  
      return res_oop;
    }