refactoring, additional verification

Author: tschatzl

src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp

@@ -269,16 +269,15 @@ inline void G1CollectedHeap::pin_object(JavaThread* thread, oop obj) {
   HeapRegion* r = heap_region_containing(obj);
   uint obj_region_idx = r->hrm_index();
 
-  uint cached_idx = G1ThreadLocalData::cached_pinned_region_idx(thread);
-  if (cached_idx == obj_region_idx) {
+  uint cache_region_idx = G1ThreadLocalData::cached_pinned_region_idx(thread);
+  if (cache_region_idx == obj_region_idx) {
     G1ThreadLocalData::inc_cached_pin_count(thread);
   } else {
     // Flush old.
-    size_t cached_pin_count = G1ThreadLocalData::cached_pin_count(thread);
-    if (cached_pin_count != 0) {
-      region_at(cached_idx)->add_pinned_object_count(cached_pin_count);
+    size_t cache_pin_count = G1ThreadLocalData::get_and_set_pin_cache(thread, obj_region_idx, (size_t)1);
+    if (cache_pin_count != 0) {
+      region_at(cache_region_idx)->add_pinned_object_count(cache_pin_count);
     }
-    G1ThreadLocalData::get_and_set_pin_cache(thread, obj_region_idx, (size_t)1);
   }
 }
 
@@ -288,16 +287,15 @@ inline void G1CollectedHeap::unpin_object(JavaThread* thread, oop obj) {
   HeapRegion* r = heap_region_containing(obj);
   uint obj_region_idx = r->hrm_index();
 
-  uint cached_idx = G1ThreadLocalData::cached_pinned_region_idx(thread);
-  if (cached_idx == obj_region_idx) {
+  uint cache_region_idx = G1ThreadLocalData::cached_pinned_region_idx(thread);
+  if (cache_region_idx == obj_region_idx) {
     G1ThreadLocalData::dec_cached_pin_count(thread);
   } else {
     // Flush old.
-    size_t cached_pin_count = G1ThreadLocalData::cached_pin_count(thread);
-    if (cached_pin_count != 0) {
-      region_at(cached_idx)->add_pinned_object_count(cached_pin_count);
+    size_t cache_pin_count = G1ThreadLocalData::get_and_set_pin_cache(thread, obj_region_idx, ~(size_t)0);
+    if (cache_pin_count != 0) {
+      region_at(cache_region_idx)->add_pinned_object_count(cache_pin_count);
     }
-    G1ThreadLocalData::get_and_set_pin_cache(thread, obj_region_idx, ~(size_t)0);
   }
 }
 

src/hotspot/share/gc/g1/g1ThreadLocalData.hpp

@@ -99,9 +99,11 @@ class G1ThreadLocalData {
     return data(thread)->_pin_cache.region_idx();
   }
 
+#ifdef ASSERT
   static size_t cached_pin_count(Thread* thread) {
     return data(thread)->_pin_cache.count();
   }
+#endif
 
   static void inc_cached_pin_count(Thread* thread) {
     data(thread)->_pin_cache.inc_count();

src/hotspot/share/gc/g1/g1YoungCollector.cpp

@@ -1087,6 +1087,12 @@ void G1YoungCollector::collect() {
 
     pre_evacuate_collection_set(jtm.evacuation_info());
 
+#ifdef ASSERT
+    for (JavaThreadIteratorWithHandle jtiwh; JavaThread *thread = jtiwh.next(); ) {
+      assert(G1ThreadLocalData::cached_pin_count(thread) == 0, "must be flushed");
+    }
+#endif
+
     G1ParScanThreadStateSet per_thread_states(_g1h,
                                               workers()->active_workers(),
                                               collection_set(),

src/hotspot/share/gc/g1/g1YoungGCPreEvacuateTasks.cpp

@@ -140,7 +140,7 @@ class G1PreEvacuateCollectionSetBatchTask::NonJavaThreadFlushLogs : public G1Abs
       G1DirtyCardQueueSet& qset = G1BarrierSet::dirty_card_queue_set();
       _refinement_stats += qset.concatenate_log_and_stats(thread);
 
-      assert(G1ThreadLocalData::cached_pin_count(thread) == 0, "NonJava thread pinned Java objects");
+      assert(G1ThreadLocalData::cached_pin_count(thread) == 0, "NonJava thread has pinned Java objects");
     }
   } _tc;