Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update JVM_VirtualThreadDisableSuspend #18672

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions runtime/j9vm/exports.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -441,11 +441,6 @@ endif()
if(NOT JAVA_SPEC_VERSION LESS 22)
jvm_add_exports(jvm
JVM_ExpandStackFrameInfo
)
endif()

if(NOT JAVA_SPEC_VERSION LESS 23)
jvm_add_exports(jvm
JVM_VirtualThreadDisableSuspend
)
endif()
Expand Down
4 changes: 0 additions & 4 deletions runtime/j9vm/j9vmnatives.xml
Original file line number Diff line number Diff line change
Expand Up @@ -450,10 +450,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
<exports group="jdk22">
<!-- Additions for Java 22 (General) -->
<export name="JVM_ExpandStackFrameInfo"/>
</exports>

<exports group="jdk23">
<!-- Additions for Java 23 (General) -->
<export name="JVM_VirtualThreadDisableSuspend"/>
</exports>
</exportlists>
8 changes: 4 additions & 4 deletions runtime/j9vm/javanextvmi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -724,14 +724,14 @@ JVM_ExpandStackFrameInfo(JNIEnv *env, jobject object)
{
assert(!"JVM_ExpandStackFrameInfo unimplemented");
}
#endif /* JAVA_SPEC_VERSION >= 22 */

#if JAVA_SPEC_VERSION >= 23
JNIEXPORT void JNICALL
JVM_VirtualThreadDisableSuspend(JNIEnv *env, jobject vthread, jboolean enter)
{
assert(!"JVM_VirtualThreadDisableSuspend unimplemented");
/* TODO: Add implementation.
* See https://github.com/eclipse-openj9/openj9/issues/18671 for more details.
*/
}
#endif /* JAVA_SPEC_VERSION >= 23 */
#endif /* JAVA_SPEC_VERSION >= 22 */

} /* extern "C" */
2 changes: 1 addition & 1 deletion runtime/redirector/forwarders.m4
Original file line number Diff line number Diff line change
Expand Up @@ -429,5 +429,5 @@ _IF([defined(J9VM_OPT_VALHALLA_VALUE_TYPES)],
[_X(JVM_IsValhallaEnabled, JNICALL, false, jboolean, void)])
_IF([JAVA_SPEC_VERSION >= 22],
[_X(JVM_ExpandStackFrameInfo, JNICALL, false, void, JNIEnv *env, jobject object)])
_IF([JAVA_SPEC_VERSION >= 23],
_IF([JAVA_SPEC_VERSION >= 22],
[_X(JVM_VirtualThreadDisableSuspend, JNICALL, false, void, JNIEnv *env, jobject vthread, jboolean enter)])