Home Original page

Merge pull request #22369 from tajila/vt5 · eclipse-openj9/openj9@22e3e66

@@ -1963,8 +1963,14 @@ class INTERPRETER_CLASS

19631963

VM_BytecodeAction rc = EXECUTE_BYTECODE;

19641964

J9ROMMethod *romMethod = J9_ROM_METHOD_FROM_RAM_METHOD(_literals);

19651965

UDATA relativeBP = 0;

1966+

#if JAVA_SPEC_VERSION >= 24

1967+

bool j2i = false;

1968+

#endif /* JAVA_SPEC_VERSION >= 24 */

19661969

if (*_sp & J9_STACK_FLAGS_J2_IFRAME) {

19671970

relativeBP = (((UDATA*)(((J9SFJ2IFrame*)_sp) + 1)) - 1) - _arg0EA;

1971+

#if JAVA_SPEC_VERSION >= 24

1972+

j2i = true;

1973+

#endif /* JAVA_SPEC_VERSION >= 24 */

19681974

} else {

19691975

relativeBP = (((UDATA*)(((J9SFStackFrame*)_sp) + 1)) - 1) - _arg0EA;

19701976

}

@@ -2071,7 +2077,7 @@ class INTERPRETER_CLASS

20712077

#endif /* defined(J9VM_OPT_CRIU_SUPPORT) */

20722078

#if JAVA_SPEC_VERSION >= 24

20732079

case J9_OBJECT_MONITOR_YIELD_VIRTUAL: {

2074-

rc = yieldPinnedContinuation(REGISTER_ARGS, JAVA_LANG_VIRTUALTHREAD_BLOCKING, J9VM_CONTINUATION_RETURN_FROM_SYNC_METHOD);

2080+

rc = yieldPinnedContinuation(REGISTER_ARGS, JAVA_LANG_VIRTUALTHREAD_BLOCKING, j2i ? J9VM_CONTINUATION_RETURN_FROM_SYNC_METHOD_J2I : J9VM_CONTINUATION_RETURN_FROM_SYNC_METHOD);

20752081

break;

20762082

}

20772083

#endif /* JAVA_SPEC_VERSION >= 24 */