Add initializeMethodRunAddressForSnapshot function

Signed-off-by: Nathan Henderson <[email protected]>

runtime/oti/j9nonbuilder.h

@@ -4950,6 +4950,9 @@ typedef struct J9InternalVMFunctions {
 	void  ( *printThreadInfo)(struct J9JavaVM *vm, struct J9VMThread *self, char *toFile, BOOLEAN allThreads) ;
 	void  (JNICALL *initializeAttachedThread)(struct J9VMThread *vmContext, const char *name, j9object_t *group, UDATA daemon, struct J9VMThread *initializee) ;
 	void  ( *initializeMethodRunAddressNoHook)(struct J9JavaVM* vm, J9Method *method) ;
+#if defined(J9VM_OPT_SNAPSHOTS)
+	void  ( *initializeMethodRunAddressForSnapshot)(struct J9JavaVM *vm, struct J9Method *method) ;
+#endif /* defined(J9VM_OPT_SNAPSHOTS) */
 	void  (JNICALL *sidecarInvokeReflectMethod)(struct J9VMThread *vmContext, jobject methodRef, jobject recevierRef, jobjectArray argsRef) ;
 	void  (JNICALL *sidecarInvokeReflectConstructor)(struct J9VMThread *vmContext, jobject constructorRef, jobject recevierRef, jobjectArray argsRef) ;
 	struct J9MemorySegmentList*  ( *allocateMemorySegmentListWithSize)(struct J9JavaVM * javaVM, U_32 numberOfMemorySegments, UDATA sizeOfElements, U_32 memoryCategory) ;

runtime/oti/vm_api.h

@@ -1261,20 +1261,30 @@ growJavaStack(J9VMThread * vmThread, UDATA newStackSize);
 * @brief
 * @param *vmThread
 * @param *method
-* @param *jxeDescription
 * @return void
 */
 void
 initializeMethodRunAddress(J9VMThread *vmThread, J9Method *method);
 
 /**
 * @brief
-* @param vm
+* @param *vm
+* @param *method
+* @return void
+*/
+void
+initializeMethodRunAddressNoHook(J9JavaVM *vm, J9Method *method);
+
+#if defined(J9VM_OPT_SNAPSHOTS)
+/**
+* @brief
+* @param *vm
 * @param *method
 * @return void
 */
 void
-initializeMethodRunAddressNoHook(J9JavaVM* vm, J9Method *method);
+initializeMethodRunAddressForSnapshot(J9JavaVM *vm, J9Method *method);
+#endif /* defined(J9VM_OPT_SNAPSHOTS) */
 
 /**
 * @brief

runtime/vm/VMSnapshotImpl.cpp

@@ -723,7 +723,7 @@ VMSnapshotImpl::fixupMethodRunAddresses(J9Class *ramClass)
 		UDATA count = romClass->romMethodCount;
 		J9Method *ramMethod = ramClass->ramMethods;
 		for (UDATA i = 0; i < count; i++) {
-			initializeMethodRunAddressNoHook(_vm, ramMethod);
+			initializeMethodRunAddressForSnapshot(_vm, ramMethod);
 			ramMethod++;
 		}
 	}

runtime/vm/initsendtarget.cpp

@@ -292,6 +292,32 @@ initializeMethodRunAddressNoHook(J9JavaVM* vm, J9Method *method)
 	method->methodRunAddress = J9_BCLOOP_ENCODE_SEND_TARGET(J9_BCLOOP_SEND_TARGET_NON_SYNC);
 }
 
+/* This function is similar to initializeMethodRunAddress but without the hook call.
+ * initializeMethodRunAddressNoHook cannot be used becuase method->extra
+ * and/or methodRunAddress may not be set properly when fixing up the classes
+ * before writing the snapshot.
+ */
+#if defined(J9VM_OPT_SNAPSHOTS)
+void
+initializeMethodRunAddressForSnapshot(J9JavaVM *vm, J9Method *method)
+{
+	method->extra = (void *)J9_STARTPC_NOT_TRANSLATED;
+
+#if defined(J9VM_OPT_OPENJDK_METHODHANDLE)
+	if (initializeMethodRunAddressMethodHandle(method)) {
+		return;
+	}
+#endif /* defined(J9VM_OPT_OPENJDK_METHODHANDLE) */
+
+#if defined(J9VM_OPT_METHOD_HANDLE)
+	if (initializeMethodRunAddressVarHandle(method)) {
+		return;
+	}
+#endif /* defined(J9VM_OPT_METHOD_HANDLE) */
+	initializeMethodRunAddressNoHook(vm, method);
+}
+#endif /* defined(J9VM_OPT_SNAPSHOTS) */
+
 #if !defined(J9VM_OPT_SNAPSHOTS)
 J9Method cInitialStaticMethod = { 0, 0, J9_BCLOOP_ENCODE_SEND_TARGET(J9_BCLOOP_SEND_TARGET_INITIAL_STATIC), 0 };
 J9Method cInitialSpecialMethod = { 0, 0, J9_BCLOOP_ENCODE_SEND_TARGET(J9_BCLOOP_SEND_TARGET_INITIAL_SPECIAL), 0 };

runtime/vm/intfunc.c

@@ -155,6 +155,9 @@ J9InternalVMFunctions J9InternalFunctions = {
 	printThreadInfo,
 	initializeAttachedThread,
 	initializeMethodRunAddressNoHook,
+#if defined(J9VM_OPT_SNAPSHOTS)
+	initializeMethodRunAddressForSnapshot,
+#endif /* defined(J9VM_OPT_SNAPSHOTS) */
 	sidecarInvokeReflectMethod,
 	sidecarInvokeReflectConstructor,
 	allocateMemorySegmentListWithSize,