resolve conflict

LizBing · Dec 8, 2023 · e6d7dfe · e6d7dfe
1 parent fef7f8a
commit e6d7dfe
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/hotspot/share/gc/serial/serialHeap.cpp b/src/hotspot/share/gc/serial/serialHeap.cpp
@@ -46,6 +46,7 @@
 #include "gc/serial/genMarkSweep.hpp"
 #include "gc/serial/markSweep.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
+#include "gc/shared/classUnloadingContext.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
 #include "gc/shared/collectorCounters.hpp"
 #include "gc/shared/continuationGCSupport.inline.hpp"
@@ -621,6 +622,9 @@ void SerialHeap::do_collection(bool full,
 
  CodeCache::on_gc_marking_cycle_start();
 
+ ClassUnloadingContext ctx(1 /* num_nmethod_unlink_workers */,
+ false /* lock_codeblob_free_separately */);
+
  collect_generation(_old_gen,
  full,
  size,