From e6d7dfed124554c91eb446e6b905864bdb74082c Mon Sep 17 00:00:00 2001 From: Lei Zaakjyu Date: Fri, 8 Dec 2023 20:57:29 +0800 Subject: [PATCH] resolve conflict --- src/hotspot/share/gc/serial/serialHeap.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/hotspot/share/gc/serial/serialHeap.cpp b/src/hotspot/share/gc/serial/serialHeap.cpp index 6458d884f5a71..f91785f49fe57 100644 --- 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,