src/hotspot/share/gc/shenandoah/shenandoahOopClosures.inline.hpp

rev 50076 : Fold Partial GC into Traversal GC

@@ -24,11 +24,10 @@
 #ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_INLINE_HPP
 #define SHARE_VM_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_INLINE_HPP
 
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahConcurrentMark.inline.hpp"
-#include "gc/shenandoah/shenandoahPartialGC.inline.hpp"
 #include "gc/shenandoah/shenandoahTraversalGC.inline.hpp"
 
 template<class T, UpdateRefsMode UPDATE_REFS, bool STRING_DEDUP>
 inline void ShenandoahMarkRefsSuperClosure::work(T *p) {
   ShenandoahConcurrentMark::mark_through_ref<T, UPDATE_REFS, STRING_DEDUP>(p, _heap, _queue, _dedup_queue);

@@ -42,16 +41,11 @@
       _heap->connection_matrix()->set_connected(p, obj);
     }
   }
 }
 
-template <class T>
-inline void ShenandoahPartialEvacuateUpdateHeapClosure::do_oop_nv(T* p) {
-  _partial_gc->process_oop<T, true>(p, _thread, _queue);
-}
-
-template <class T, bool STRING_DEDUP, bool DEGEN>
+template <class T, bool STRING_DEDUP, bool DEGEN, bool MATRIX>
 inline void ShenandoahTraversalSuperClosure::work(T* p) {
-  _traversal_gc->process_oop<T, STRING_DEDUP, DEGEN>(p, _thread, _queue, _dedup_queue);
+  _traversal_gc->process_oop<T, STRING_DEDUP, DEGEN, MATRIX>(p, _thread, _queue, _base_obj, _dedup_queue);
 }
 
 #endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_INLINE_HPP