Add MemberName finalizer to mark clazz for MemberName list pruning

This prevents a memory leak in the maintenance of per-class lists used to find affected MemberName objects in case of class redefinition.
ibmruntimes · Mar 18, 2024 · 1619e47 · 1619e47
1 parent c86cd88
commit 1619e47
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/src/java.base/share/classes/java/lang/invoke/MemberName.java b/src/java.base/share/classes/java/lang/invoke/MemberName.java
@@ -23,6 +23,12 @@
  * questions.
  */
 
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2024, 2024 All Rights Reserved
+ * ===========================================================================
+ */
+
 package java.lang.invoke;
 
 import sun.invoke.util.BytecodeDescriptor;
@@ -1196,4 +1202,11 @@ private static MemberName[] newMemberBuffer(int length) {
             return buf;
         }
     }
+
+    @Override
+    protected void finalize() {
+        if (null != clazz) {
+            MethodHandleNatives.markClassForMemberNamePruning(clazz);
+        }
+    }
 }
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java b/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java
@@ -23,6 +23,12 @@
  * questions.
  */
 
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2024, 2024 All Rights Reserved
+ * ===========================================================================
+ */
+
 package java.lang.invoke;
 
 import jdk.internal.access.JavaLangAccess;
@@ -690,4 +696,9 @@ static Object classData(Class<?> c) {
         UNSAFE.ensureClassInitialized(c);
         return JLA.classData(c);
     }
+
+    /**
+     * Inform the VM that a MemberName belonging to class c has been collected.
+     */
+    static native void markClassForMemberNamePruning(Class<?> c);
 }