Recognize JNI local refs in JNINativeMethodFrames

First 8 JNI local refs are directly stored inside the J9SFJNINativeMethodFrame before allocating J9JNIReferenceFrame to store additional references. StackWalker should check if the object pushes from method frame is JNI local when walking O-Slots. Signed-off-by: Jack Lu <[email protected]>
eclipse-openj9 · Oct 30, 2023 · cec8a15 · cec8a15
1 parent 4ba8f3d
commit cec8a15
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/runtime/vm/swalk.c b/runtime/vm/swalk.c
@@ -701,6 +701,7 @@ static void
 walkMethodFrame(J9StackWalkState * walkState)
 {
 	J9SFMethodFrame * methodFrame = (J9SFMethodFrame *) ((U_8*) walkState->walkSP + (UDATA) walkState->literals);
+	BOOLEAN isJNINative = (J9SF_FRAME_TYPE_JNI_NATIVE_METHOD == (UDATA)walkState->pc);
 
 	walkState->bp = (UDATA *) &(methodFrame->savedA0);
 	walkState->frameFlags = methodFrame->specialFrameFlags;
@@ -734,7 +735,7 @@ walkMethodFrame(J9StackWalkState * walkState)
 #endif
 
 	if ((walkState->flags & J9_STACKWALK_ITERATE_O_SLOTS) && walkState->literals) {
-		if (walkState->frameFlags & J9_SSF_JNI_REFS_REDIRECTED) {
+		if ((walkState->frameFlags & J9_SSF_JNI_REFS_REDIRECTED) || isJNINative) {
 			walkPushedJNIRefs(walkState);
 		} else {
 			walkObjectPushes(walkState);