Fix for jdk-21+24

Author: caizixian

openjdk/share/mmtkBarrierSet.cpp

@@ -90,6 +90,7 @@ MMTkBarrierSet::MMTkBarrierSet(MemRegion whole_heap):
              (BarrierSetC1*) get_selected_barrier()->create_c1(),
              (BarrierSetC2*) get_selected_barrier()->create_c2(),
              NULL,
+             NULL,
              BarrierSet::FakeRtti(BarrierSet::ThirdPartyHeapBarrierSet)),
   _whole_heap(whole_heap),
   _runtime(get_selected_barrier()->create_runtime()) {}

openjdk/share/mmtkBarrierSetC2.cpp

@@ -411,7 +411,7 @@ void MMTkBarrierSetC2::expand_allocate(PhaseMacroExpand* x,
       }
     }
 
-    if (x->C->env()->dtrace_extended_probes()) {
+    if (x->C->env()->dtrace_alloc_probes()) {
       // Slow-path call
       int size = TypeFunc::Parms + 2;
       CallLeafNode *call = new CallLeafNode(OptoRuntime::dtrace_object_alloc_Type(),

openjdk/share/mmtkHeap.cpp

@@ -34,6 +34,7 @@
 #include "gc/shared/scavengableNMethods.hpp"
 #include "gc/shared/strongRootsScope.hpp"
 #include "gc/shared/weakProcessor.hpp"
+#include "gc/shared/gcLocker.inline.hpp"
 #include "logging/log.hpp"
 #include "memory/resourceArea.hpp"
 #include "mmtk.h"
@@ -332,7 +333,7 @@ void MMTkHeap::initialize_serviceability() {//OK
 
   _mmtk_pool = new MMTkMemoryPool(_start, _end, "MMTk pool", MinHeapSize, false);
 
-  _mmtk_manager = new GCMemoryManager("MMTk GC", "end of GC");
+  _mmtk_manager = new GCMemoryManager("MMTk GC");
   _mmtk_manager->add_pool(_mmtk_pool);
 }
 
@@ -459,6 +460,17 @@ bool MMTkHeap::requires_barriers(stackChunkOop obj) const {
   return false;
 }
 
+void MMTkHeap::pin_object(JavaThread* thread, oop obj) {
+  // TODO use mmtk-core pin_object
+  GCLocker::lock_critical(thread);
+}
+
+void MMTkHeap::unpin_object(JavaThread* thread, oop obj) {
+  // TODO use mmtk-core unpin_object
+  GCLocker::unlock_critical(thread);
+}
+
+
 /*
  * files with prints currently:
  * collectedHeap.inline.hpp, mmtkHeap.cpp,

openjdk/share/mmtkHeap.hpp

@@ -137,6 +137,9 @@ class MMTkHeap : public CollectedHeap {
   // Iterate over all objects, calling "cl.do_object" on each.
   void object_iterate(ObjectClosure* cl);
 
+  void pin_object(JavaThread* thread, oop obj);
+  void unpin_object(JavaThread* thread, oop obj);
+
   // Similar to object_iterate() except iterates only
   // over live objects.
   void safe_object_iterate(ObjectClosure* cl) ;