Skip to content

Commit b9e7446

Browse files
authored
Merge pull request ibmruntimes#423 from JasonFengJ9/notcheckpointsafe
CRIU adds @NotCheckpointSafe for MethodAccessorGenerator.generateName()
2 parents f7e111d + 6e235d9 commit b9e7446

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

closed/GensrcJ9JCL.gmk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ $(eval $(call SetupCopyFiles,COPY_OVERLAY_FILES, \
5151
src/java.base/share/classes/java/util/zip/ZipFile.java \
5252
src/java.base/share/classes/jdk/internal/access/JavaNetInetAddressAccess.java \
5353
src/java.base/share/classes/jdk/internal/ref/PhantomCleanable.java \
54+
src/java.base/share/classes/jdk/internal/reflect/MethodAccessorGenerator.java \
5455
src/java.base/share/classes/module-info.java \
5556
src/java.base/share/classes/sun/security/jca/ProviderConfig.java \
5657
src/java.base/share/classes/sun/security/jca/ProviderList.java \

src/java.base/share/classes/jdk/internal/reflect/MethodAccessorGenerator.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,21 @@
2323
* questions.
2424
*/
2525

26+
/*
27+
* ===========================================================================
28+
* (c) Copyright IBM Corp. 2024, 2024 All Rights Reserved
29+
* ===========================================================================
30+
*/
31+
2632
package jdk.internal.reflect;
2733

2834
import java.security.AccessController;
2935
import java.security.PrivilegedAction;
3036

37+
/*[IF CRIU_SUPPORT]*/
38+
import openj9.internal.criu.NotCheckpointSafe;
39+
/*[ENDIF] CRIU_SUPPORT */
40+
3141
/** Generator for sun.reflect.MethodAccessor and
3242
sun.reflect.ConstructorAccessor objects using bytecodes to
3343
implement reflection. A java.lang.reflect.Method or
@@ -748,6 +758,9 @@ private String buildInternalSignature() {
748758
return sb.toString();
749759
}
750760

761+
/*[IF CRIU_SUPPORT]*/
762+
@NotCheckpointSafe
763+
/*[ENDIF] CRIU_SUPPORT */
751764
private static synchronized String generateName(boolean isConstructor,
752765
boolean forSerialization)
753766
{

0 commit comments

Comments
 (0)