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

*** 94,11 ***
  
  public:
    ShenandoahTimingsTracker(ShenandoahPhaseTimings::Phase phase, bool should_aggregate = false);
    ~ShenandoahTimingsTracker();
  
!   static ShenandoahPhaseTimings::Phase current_phase() { return _current_phase; }
  
    static bool is_current_phase_valid();
  };
  
  /*
--- 94,14 ---
  
  public:
    ShenandoahTimingsTracker(ShenandoahPhaseTimings::Phase phase, bool should_aggregate = false);
    ~ShenandoahTimingsTracker();
  
!   static ShenandoahPhaseTimings::Phase current_phase() {
+     assert(is_current_phase_valid(), "Current phase is not valid");
+     return _current_phase;
+   }
  
    static bool is_current_phase_valid();
  };
  
  /*

*** 189,11 ***
      VM_Operation::VMOp_Type type = vm_op->type();
      return type == VM_Operation::VMOp_ShenandoahInitMark ||
             type == VM_Operation::VMOp_ShenandoahFinalMarkStartEvac ||
             type == VM_Operation::VMOp_ShenandoahInitUpdateRefs ||
             type == VM_Operation::VMOp_ShenandoahFinalUpdateRefs ||
!            type == VM_Operation::VMOp_ShenandoahFinalVerify ||
             type == VM_Operation::VMOp_ShenandoahFullGC ||
             type == VM_Operation::VMOp_ShenandoahDegeneratedGC;
    }
  };
  
--- 192,11 ---
      VM_Operation::VMOp_Type type = vm_op->type();
      return type == VM_Operation::VMOp_ShenandoahInitMark ||
             type == VM_Operation::VMOp_ShenandoahFinalMarkStartEvac ||
             type == VM_Operation::VMOp_ShenandoahInitUpdateRefs ||
             type == VM_Operation::VMOp_ShenandoahFinalUpdateRefs ||
!            type == VM_Operation::VMOp_ShenandoahFinalRoots ||
             type == VM_Operation::VMOp_ShenandoahFullGC ||
             type == VM_Operation::VMOp_ShenandoahDegeneratedGC;
    }
  };