JDK-21-specific additions

Author: tstuefe

src/hotspot/share/gc/g1/g1Allocator.hpp

@@ -122,7 +122,7 @@ class G1Allocator : public CHeapObj<mtGC> {
   // current allocation region, and then attempts an allocation using a new region.
   inline HeapWord* attempt_allocation_locked(uint node_index, size_t word_size);
 
-  inline HeapWord* attempt_allocation_force(size_t word_size);
+  inline HeapWord* attempt_allocation_force(uint node_index, size_t word_size);
 
   size_t unsafe_max_tlab_alloc();
   size_t used_in_alloc_regions();

src/hotspot/share/gc/g1/g1Allocator.inline.hpp

@@ -69,8 +69,7 @@ inline HeapWord* G1Allocator::attempt_allocation_locked(uint node_index, size_t
   return result;
 }
 
-inline HeapWord* G1Allocator::attempt_allocation_force(size_t word_size) {
-  uint node_index = current_node_index();
+inline HeapWord* G1Allocator::attempt_allocation_force(uint node_index, size_t word_size) {
   return mutator_alloc_region(node_index)->attempt_allocation_force(word_size);
 }
 

src/hotspot/share/gc/g1/g1CollectedHeap.cpp

@@ -438,7 +438,7 @@ HeapWord* G1CollectedHeap::attempt_allocation_slow(uint node_index, size_t word_
       if (GCLocker::is_active_and_needs_gc() && policy()->can_expand_young_list()) {
         // No need for an ergo message here, can_expand_young_list() does this when
         // it returns true.
-        result = _allocator->attempt_allocation_force(word_size);
+        result = _allocator->attempt_allocation_force(node_index, word_size);
         if (result != nullptr) {
           return result;
         }