# HG changeset patch
# User Haoyu Li <leihouyju@gmail.com>
# Date 1575376555 -28800
#      Tue Dec 03 20:35:55 2019 +0800
# Node ID 9c6edeed59228b6affa794e5ca40e1d9d8b9fd13
# Parent  31248eef02cd56a9dc9ac6b7157025a7d5dca17d
use statics by the class name and update some assertions

diff -r 31248eef02cd -r 9c6edeed5922 src/hotspot/share/gc/parallel/psCompactionManager.hpp
--- a/src/hotspot/share/gc/parallel/psCompactionManager.hpp	Tue Dec 03 20:35:00 2019 +0800
+++ b/src/hotspot/share/gc/parallel/psCompactionManager.hpp	Tue Dec 03 20:35:55 2019 +0800
@@ -119,7 +119,7 @@
   // marking stack and overflow stack directly.
 
  public:
-  static const size_t  InvalidShadow = ~0;
+  static const size_t InvalidShadow = ~0;
   static size_t  pop_shadow_region_mt_safe(PSParallelCompact::RegionData* region_ptr);
   static void    push_shadow_region_mt_safe(size_t shadow_region);
   static void    push_shadow_region(size_t shadow_region);
diff -r 31248eef02cd -r 9c6edeed5922 src/hotspot/share/gc/parallel/psParallelCompact.cpp
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp	Tue Dec 03 20:35:00 2019 +0800
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp	Tue Dec 03 20:35:55 2019 +0800
@@ -2978,7 +2978,7 @@
         // fills the shadow region will copy the data back (see
         // MoveAndUpdateShadowClosure::complete_region).
         copy_back(sd.region_to_addr(cur->shadow_region()), sd.region_to_addr(cur));
-        cm->push_shadow_region_mt_safe(cur->shadow_region());
+        ParCompactionManager::push_shadow_region_mt_safe(cur->shadow_region());
         cur->set_completed();
       }
     }
@@ -3171,11 +3171,11 @@
   // Get a shadow region first
   ParallelCompactData& sd = summary_data();
   RegionData* const region_ptr = sd.region(region_idx);
-  size_t shadow_region = cm->pop_shadow_region_mt_safe(region_ptr);
+  size_t shadow_region = ParCompactionManager::pop_shadow_region_mt_safe(region_ptr);
   // The InvalidShadow return value indicates the corresponding heap region is available,
   // so use MoveAndUpdateClosure to fill the normal region. Otherwise, use
   // MoveAndUpdateShadowClosure to fill the acquired shadow region.
-  if (shadow_region == cm->InvalidShadow) {
+  if (shadow_region == ParCompactionManager::InvalidShadow) {
     MoveAndUpdateClosure cl(mark_bitmap(), cm, region_idx);
     region_ptr->shadow_to_normal();
     return fill_region(cm, cl, region_idx);
@@ -3352,7 +3352,7 @@
 
 void MoveAndUpdateClosure::complete_region(ParCompactionManager *cm, HeapWord *dest_addr,
                                            PSParallelCompact::RegionData *region_ptr) {
-  assert(region_ptr->shadow_state() == ParallelCompactData::RegionData::FinishedShadow, "Region should be finished");
+  assert(region_ptr->shadow_state() == ParallelCompactData::RegionData::NormalRegion, "Region should be finished");
   region_ptr->set_completed();
 }
 
@@ -3390,7 +3390,7 @@
 
 void MoveAndUpdateShadowClosure::complete_region(ParCompactionManager *cm, HeapWord *dest_addr,
                                                  PSParallelCompact::RegionData *region_ptr) {
-  assert(region_ptr->shadow_state() == ParallelCompactData::RegionData::Shadow, "Region should be shadow");
+  assert(region_ptr->shadow_state() == ParallelCompactData::RegionData::ShadowRegion, "Region should be shadow");
   // Record the shadow region index
   region_ptr->set_shadow_region(_shadow);
   // Mark the shadow region as filled to indicate the data is ready to be
@@ -3403,7 +3403,7 @@
   if (((region_ptr->available() && region_ptr->claim()) || region_ptr->claimed()) && region_ptr->mark_copied()) {
     region_ptr->set_completed();
     PSParallelCompact::copy_back(PSParallelCompact::summary_data().region_to_addr(_shadow), dest_addr);
-    cm->push_shadow_region_mt_safe(_shadow);
+    ParCompactionManager::push_shadow_region_mt_safe(_shadow);
   }
 }
 
diff -r 31248eef02cd -r 9c6edeed5922 src/hotspot/share/gc/parallel/psParallelCompact.hpp
--- a/src/hotspot/share/gc/parallel/psParallelCompact.hpp	Tue Dec 03 20:35:00 2019 +0800
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.hpp	Tue Dec 03 20:35:55 2019 +0800
@@ -638,7 +638,7 @@
 
 inline void ParallelCompactData::RegionData::mark_filled() {
   int old = Atomic::cmpxchg(FilledShadow, &_shadow_state, ShadowRegion, memory_order_relaxed);
-  assert(old == Shadow, "Fail to mark the region as filled");
+  assert(old == ShadowRegion, "Fail to mark the region as filled");
 }
 
 inline bool ParallelCompactData::RegionData::mark_copied() {
@@ -647,7 +647,7 @@
 
 void ParallelCompactData::RegionData::shadow_to_normal() {
   int old = Atomic::cmpxchg(NormalRegion, &_shadow_state, ShadowRegion, memory_order_relaxed);
-  assert(old == Shadow, "Fail to mark the region as finish");
+  assert(old == ShadowRegion, "Fail to mark the region as finish");
 }
 
 inline ParallelCompactData::RegionData*