Merge
authorjmasa
Wed, 04 May 2016 00:00:24 +0000
changeset 38180 103a07898ed1
parent 38178 0860ff91a12e (current diff)
parent 38179 d2c90d6c5bf4 (diff)
child 38182 665402f9d171
Merge
--- a/hotspot/src/share/vm/gc/parallel/psParallelCompact.cpp	Wed May 04 00:45:59 2016 +0200
+++ b/hotspot/src/share/vm/gc/parallel/psParallelCompact.cpp	Wed May 04 00:00:24 2016 +0000
@@ -1929,7 +1929,7 @@
     ParCompactionManager* const cm =
       ParCompactionManager::manager_array(int(i));
     assert(cm->marking_stack()->is_empty(),       "should be empty");
-    assert(cm->region_stack()->is_empty(), "should be empty");
+    assert(cm->region_stack()->is_empty(), "Region stack " SIZE_FORMAT " is not empty", i);
   }
 #endif // ASSERT
 
@@ -2370,10 +2370,8 @@
 
   // Once a thread has drained it's stack, it should try to steal regions from
   // other threads.
-  if (parallel_gc_threads > 1) {
-    for (uint j = 0; j < parallel_gc_threads; j++) {
-      q->enqueue(new StealRegionCompactionTask(terminator_ptr));
-    }
+  for (uint j = 0; j < parallel_gc_threads; j++) {
+    q->enqueue(new StealRegionCompactionTask(terminator_ptr));
   }
 }