Merge pull request #18379 from LinHu2016/Loom_GC_update_21

Fix JNI Local Reference reporting issue
eclipse-openj9 · Nov 1, 2023 · ca9cc47 · ca9cc47
2 parents 0ee3f98 + 479e4f7
commit ca9cc47
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/runtime/gc_base/ReferenceChainWalker.cpp b/runtime/gc_base/ReferenceChainWalker.cpp
@@ -644,9 +644,12 @@ MM_ReferenceChainWalker::doStackSlot(J9Object **slotPtr, void *walkState, const
 	J9Object *slotValue = *slotPtr;
 
 	/* Only report heap objects */
-
 	if (isHeapObject(slotValue) && !_heap->objectIsInGap(slotValue)) {
-		doSlot(slotPtr, J9GC_ROOT_TYPE_STACK_SLOT, -1, (J9Object *)walkState);
+		if (J9_STACKWALK_SLOT_TYPE_JNI_LOCAL == ((J9StackWalkState *)walkState)->slotType) {
+			doSlot(slotPtr, J9GC_ROOT_TYPE_JNI_LOCAL, -1, (J9Object *)walkState);
+		} else {
+			doSlot(slotPtr, J9GC_ROOT_TYPE_STACK_SLOT, -1, (J9Object *)walkState);
+		}
 	}
 }