Automatic merge of jdk:master into master

openjdk · May 29, 2020 · 3ccb5c9 · 3ccb5c9
2 parents 1c1dc9d + e639c9a
commit 3ccb5c9
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
@@ -267,9 +267,10 @@ class ShenandoahFinalMarkingTask : public AbstractGangTask {
       }
     }
 
-    if (heap->is_degenerated_gc_in_progress()) {
-      // Degenerated cycle may bypass concurrent cycle, so code roots might not be scanned,
-      // let's check here.
+    if (heap->is_degenerated_gc_in_progress() || heap->is_full_gc_in_progress()) {
+      // Full GC does not execute concurrent cycle.
+      // Degenerated cycle may bypass concurrent cycle.
+      // So code roots might not be scanned, let's scan here.
       _cm->concurrent_scan_code_roots(worker_id, rp);
     }