src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.hpp

@@ -26,19 +26,21 @@
  #define SHARE_GC_SHENANDOAH_SHENANDOAHDEGENERATEDGC_HPP
  
  #include "gc/shenandoah/shenandoahGC.hpp"
  
  class VM_ShenandoahDegeneratedGC;
+ class ShenandoahGeneration;
  
  class ShenandoahDegenGC : public ShenandoahGC {
    friend class VM_ShenandoahDegeneratedGC;
  private:
    const ShenandoahDegenPoint  _degen_point;
+   ShenandoahGeneration* _generation;
    bool _abbreviated;
  
  public:
-   ShenandoahDegenGC(ShenandoahDegenPoint degen_point);
+   ShenandoahDegenGC(ShenandoahDegenPoint degen_point, ShenandoahGeneration* generation);
    bool collect(GCCause::Cause cause);
  
  private:
    void vmop_degenerated();
    void entry_degenerated();

@@ -54,10 +56,13 @@
    void op_init_updaterefs();
    void op_updaterefs();
    void op_update_roots();
    void op_cleanup_complete();
  
+   // This will rebuild card offsets, which is necessary if classes were unloaded
+   void op_global_coalesce_and_fill();
+ 
    // Fail handling
    void op_degenerated_futile();
    void op_degenerated_fail();
  
    // Turns this degenerated cycle into a full gc without leaving the safepoint