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

rev 14442 : Backout: Refactor evac-in-progress flag to more general gc-phase flag.

@@ -1508,17 +1508,17 @@
   // Note: it is important to first release the _evacuation_in_progress flag here,
   // so that Java threads can get out of oom_during_evacuation() and reach a safepoint,
   // in case a VM task is pending.
   set_evacuation_in_progress(in_progress);
   MutexLocker mu(Threads_lock);
-  JavaThread::set_gc_phase_in_progress_all_threads(in_progress ? EVACUATION : NONE);
+  JavaThread::set_evacuation_in_progress_all_threads(in_progress);
 }
 
 void ShenandoahHeap::set_evacuation_in_progress_at_safepoint(bool in_progress) {
   assert(SafepointSynchronize::is_at_safepoint(), "Only call this at safepoint");
   set_evacuation_in_progress(in_progress);
-  JavaThread::set_gc_phase_in_progress_all_threads(in_progress ? EVACUATION : NONE);
+  JavaThread::set_evacuation_in_progress_all_threads(in_progress);
 }
 
 void ShenandoahHeap::set_evacuation_in_progress(bool in_progress) {
   _evacuation_in_progress = in_progress ? 1 : 0;
   OrderAccess::fence();