Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
8280901: MethodHandle::linkToNative stub is missing w/ -Xint
Backport-of: f86f38a8afd31c76039206f8f1f33371ad814396
  • Loading branch information
TheRealMDoerr committed Mar 31, 2022
1 parent 468ab69 commit 3c34eb1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/hotspot/share/classfile/systemDictionary.cpp
Expand Up @@ -2013,8 +2013,9 @@ Method* SystemDictionary::find_method_handle_intrinsic(vmIntrinsicID iid,
spe = NULL;
// Must create lots of stuff here, but outside of the SystemDictionary lock.
m = Method::make_method_handle_intrinsic(iid, signature, CHECK_NULL);
if (!Arguments::is_interpreter_only()) {
if (!Arguments::is_interpreter_only() || iid == vmIntrinsics::_linkToNative) {
// Generate a compiled form of the MH intrinsic.
// linkToNative doesn't have interpreter-specific implementation, so always has to go through compiled version.
AdapterHandlerLibrary::create_native_wrapper(m);
// Check if have the compiled code.
if (!m->has_compiled_code()) {
Expand Down
4 changes: 4 additions & 0 deletions test/jdk/java/foreign/TestDowncall.java
Expand Up @@ -31,6 +31,10 @@
* @run testng/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies
* --enable-native-access=ALL-UNNAMED -Dgenerator.sample.factor=17
* TestDowncall
*
* @run testng/othervm -Xint -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies
* --enable-native-access=ALL-UNNAMED -Dgenerator.sample.factor=100000
* TestDowncall
*/

import jdk.incubator.foreign.CLinker;
Expand Down

1 comment on commit 3c34eb1

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.