Merge pull request #15813 from keithc-ca/fix15753

Fix issues in #15753
eclipse-openj9 · Sep 2, 2022 · 87c808f · 87c808f
2 parents 00f03c2 + 2a0fb45
commit 87c808f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/runtime/jvmti/j9jvmti.tdf b/runtime/jvmti/j9jvmti.tdf
@@ -461,7 +461,6 @@ TraceAssert=Assert_JVMTI_false noEnv Overhead=1 Level=1 Assert="!(P1)"
 TraceAssert=Assert_JVMTI_notNull noEnv Overhead=1 Level=1 Assert="(P1) != NULL"
 TraceAssert=Assert_JVMTI_mustHaveVMAccess noEnv overhead=1 Level=1 Assert="(P1)->publicFlags & J9_PUBLIC_FLAGS_VM_ACCESS"
 TraceAssert=Assert_JVMTI_mustNotHaveVMAccess noEnv overhead=1 Level=1 Assert="0 == ((P1)->publicFlags & J9_PUBLIC_FLAGS_VM_ACCESS)"
-TraceAssert=Assert_JVMTI_unreachable noEnv Overhead=1 Level=1 Assert="0"
 
 TraceEntry=Trc_JVMTI_jvmtiHookResourceExhausted_Entry Overhead=1 Level=1 Noenv Template="ResourceExhaustedEvent"
 TraceExit=Trc_JVMTI_jvmtiHookResourceExhausted_Exit Overhead=1 Level=1 Noenv Template="ResourceExhaustedEvent"
@@ -639,3 +638,5 @@ TraceExit=Trc_JVMTI_jvmtiHookVirtualThreadStarted_Exit Overhead=1 Level=5 Noenv
 
 TraceEntry=Trc_JVMTI_jvmtiHookVirtualThreadDestroy_Entry Overhead=1 Level=5 Noenv Template="HookVirtualThreadDestroy"
 TraceExit=Trc_JVMTI_jvmtiHookVirtualThreadDestroy_Exit Overhead=1 Level=5 Noenv Template="HookVirtualThreadDestroy"
+
+TraceAssert=Assert_JVMTI_unreachable noEnv Overhead=1 Level=1 Assert="0"
diff --git a/runtime/jvmti/jvmtiStackFrame.c b/runtime/jvmti/jvmtiStackFrame.c
@@ -267,11 +267,11 @@ jvmtiGetFrameCount(jvmtiEnv* env,
 	jvmtiError rc;
 	J9VMThread * currentThread;
 	jint rv_count = 0;
+	J9InternalVMFunctions* vmFuncs = vm->internalVMFunctions;
 
 	Trc_JVMTI_jvmtiGetFrameCount_Entry(env);
 
 	rc = getCurrentVMThread(vm, &currentThread);
-	J9InternalVMFunctions* vmFuncs = vm->internalVMFunctions;
 	if (rc == JVMTI_ERROR_NONE) {
 		J9VMThread *targetThread = NULL;