# HG changeset patch
# Parent  a949195a022e5078a31c97b693b34ca01f2bc372

diff -r a949195a022e src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp	Thu May 28 21:27:25 2020 +0200
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp	Thu May 28 21:29:21 2020 +0200
@@ -1674,7 +1674,7 @@
 
     {
       ShenandoahEvacuateUpdateRootsClosure<> cl;
-      CLDToOopClosure clds(&cl, ClassLoaderData::_claim_strong);
+      CLDToOopClosure clds(&cl, ClassLoaderData::_claim_none);
       _cld_roots.cld_do(&clds, worker_id);
     }
 
diff -r a949195a022e src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp
--- a/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp	Thu May 28 21:27:25 2020 +0200
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.cpp	Thu May 28 21:29:21 2020 +0200
@@ -674,7 +674,7 @@
   }
 }
 
-class ShenandoahAdjustPointersClosure : public MetadataVisitingOopIterateClosure {
+class ShenandoahAdjustPointersClosure : public MetadataVisitingOopIterateClosure { // TODO: Need to deal with superclass doing _claim_strong
 private:
   ShenandoahHeap* const _heap;
   ShenandoahMarkingContext* const _ctx;
diff -r a949195a022e src/hotspot/share/gc/shenandoah/shenandoahOopClosures.hpp
--- a/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.hpp	Thu May 28 21:27:25 2020 +0200
+++ b/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.hpp	Thu May 28 21:29:21 2020 +0200
@@ -44,7 +44,7 @@
   ENQUEUE_DEDUP  // Enqueue candidate Strings for deduplication
 };
 
-class ShenandoahMarkRefsSuperClosure : public MetadataVisitingOopIterateClosure {
+class ShenandoahMarkRefsSuperClosure : public MetadataVisitingOopIterateClosure { // TODO: Need to deal with superclass doing _claim_strong
 private:
   ShenandoahObjToScanQueue* _queue;
   ShenandoahHeap* _heap;
diff -r a949195a022e src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp
--- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp	Thu May 28 21:27:25 2020 +0200
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp	Thu May 28 21:29:21 2020 +0200
@@ -206,13 +206,13 @@
 }
 
 void ShenandoahRootScanner::roots_do(uint worker_id, OopClosure* oops) {
-  CLDToOopClosure clds_cl(oops, ClassLoaderData::_claim_strong);
+  CLDToOopClosure clds_cl(oops, ClassLoaderData::_claim_none);
   MarkingCodeBlobClosure blobs_cl(oops, !CodeBlobToOopClosure::FixRelocations);
   roots_do(worker_id, oops, &clds_cl, &blobs_cl);
 }
 
 void ShenandoahRootScanner::strong_roots_do(uint worker_id, OopClosure* oops) {
-  CLDToOopClosure clds_cl(oops, ClassLoaderData::_claim_strong);
+  CLDToOopClosure clds_cl(oops, ClassLoaderData::_claim_none);
   MarkingCodeBlobClosure blobs_cl(oops, !CodeBlobToOopClosure::FixRelocations);
   strong_roots_do(worker_id, oops, &clds_cl, &blobs_cl);
 }
@@ -284,7 +284,7 @@
   _serial_roots.oops_do(oops, worker_id);
   _serial_weak_roots.weak_oops_do(oops, worker_id);
   if (_stw_class_unloading) {
-    CLDToOopClosure clds(oops, ClassLoaderData::_claim_strong);
+    CLDToOopClosure clds(oops, ClassLoaderData::_claim_none);
     _cld_roots.cld_do(&clds, worker_id);
   }
 
@@ -335,7 +335,7 @@
   CodeBlobToOopClosure* adjust_code_closure = ShenandoahConcurrentRoots::can_do_concurrent_class_unloading() ?
                                               static_cast<CodeBlobToOopClosure*>(&blobs_and_disarm_Cl) :
                                               static_cast<CodeBlobToOopClosure*>(&code_blob_cl);
-  CLDToOopClosure adjust_cld_closure(oops, ClassLoaderData::_claim_strong);
+  CLDToOopClosure adjust_cld_closure(oops, ClassLoaderData::_claim_none);
   AlwaysTrueClosure always_true;
 
   // Process serial-claiming roots first
diff -r a949195a022e src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.inline.hpp
--- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.inline.hpp	Thu May 28 21:27:25 2020 +0200
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.inline.hpp	Thu May 28 21:29:21 2020 +0200
@@ -145,7 +145,6 @@
     ClassLoaderDataGraph::always_strong_cld_do(clds);
   } else if (_claimed.try_set()) {
     ShenandoahWorkerTimingsTracker timer(_phase, ShenandoahPhaseTimings::CLDGRoots, worker_id);
-    ClassLoaderDataGraph::clear_claimed_marks();
     ClassLoaderDataGraph::always_strong_cld_do(clds);
   }
 }
@@ -158,7 +157,6 @@
     ClassLoaderDataGraph::cld_do(clds);
   } else if (_claimed.try_set()) {
     ShenandoahWorkerTimingsTracker timer(_phase, ShenandoahPhaseTimings::CLDGRoots, worker_id);
-    ClassLoaderDataGraph::clear_claimed_marks();
     ClassLoaderDataGraph::cld_do(clds);
   }
 }
@@ -188,7 +186,7 @@
                                   static_cast<CodeBlobToOopClosure*>(&blobs_and_disarm_Cl) :
                                   static_cast<CodeBlobToOopClosure*>(&update_blobs);
 
-  CLDToOopClosure clds(keep_alive, ClassLoaderData::_claim_strong);
+  CLDToOopClosure clds(keep_alive, ClassLoaderData::_claim_none);
 
   _serial_roots.oops_do(keep_alive, worker_id);
   _vm_roots.oops_do(keep_alive, worker_id);