Merge pull request #22214 from lzhou2025/frozenClassV2

tajila · web-flow · commit 22de641379d3 · 2025-07-14T11:00:16.000-04:00
RAM Class Persistence: Remove redundant call to initializeSnapshotClassObject
diff --git a/runtime/jcl/common/jcldefine.c b/runtime/jcl/common/jcldefine.c
@@ -169,9 +169,9 @@ defineClassCommon(JNIEnv *env, jobject classLoaderObject,
 
 					if (!vmFuncs->loadWarmClassFromSnapshot(currentThread, classLoader, clazz)) {
 						clazz = NULL;
+						goto done;
 					}
 
-					clazz = vmFuncs->initializeSnapshotClassObject(vm, classLoader, clazz);
 					if (NULL != protectionDomain) {
 						J9VMJAVALANGCLASS_SET_PROTECTIONDOMAIN(
 							currentThread,

Original file line number	Diff line number	Diff line change
`@@ -169,9 +169,9 @@ defineClassCommon(JNIEnv *env, jobject classLoaderObject,`
`169`	`169`
`170`	`170`	`if (!vmFuncs->loadWarmClassFromSnapshot(currentThread, classLoader, clazz)) {`
`171`	`171`	`clazz = NULL;`
	`172`	`+ goto done;`
`172`	`173`	`}`
`173`	`174`
`174`		`- clazz = vmFuncs->initializeSnapshotClassObject(vm, classLoader, clazz);`
`175`	`175`	`if (NULL != protectionDomain) {`
`176`	`176`	`J9VMJAVALANGCLASS_SET_PROTECTIONDOMAIN(`
`177`	`177`	`currentThread,`