Skip to content

[GR-62834] Native image should respect @jdk.internal.vm.annotation.DontInline #10875

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Mar 18, 2025
Merged

[GR-62834] Native image should respect @jdk.internal.vm.annotation.DontInline #10875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a1656f
svm: respect @DontInline
zapster Mar 6, 2025
561f55c
svm: substitute Invokers.maybeCustomize to remove @DontInline
zapster Mar 7, 2025
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
12 changes: 12 additions & 0 deletions ...le.svm.core/src/com/oracle/svm/core/methodhandles/Target_java_lang_invoke_MethodType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,18 @@ final class Target_java_lang_invoke_MethodType {

@TargetClass(className = "java.lang.invoke.Invokers")
final class Target_java_lang_invoke_Invokers {

/**
* Substitute to remove the {@code @DontInline} from the original method.
*/
@Substitute
static void maybeCustomize(Target_java_lang_invoke_MethodHandle mh) {
/*
* MethodHandle.maybeCustomized() is _currently_ substituted by an empty method. We still
* call it here and represent the original behavior to make it future-proof.
*/
mh.maybeCustomize();
}
}

@TargetClass(className = "java.lang.invoke.InvokerBytecodeGenerator")
Expand Down
5 changes: 5 additions & 0 deletions substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@
import jdk.graal.compiler.phases.common.CanonicalizerPhase;
import jdk.graal.compiler.virtual.phases.ea.PartialEscapePhase;
import jdk.internal.loader.NativeLibraries;
import jdk.internal.vm.annotation.DontInline;
import jdk.vm.ci.meta.DeoptimizationReason;
import jdk.vm.ci.meta.JavaConstant;
import jdk.vm.ci.meta.ResolvedJavaField;
Expand Down Expand Up @@ -810,6 +811,10 @@ public boolean hasNeverInlineDirective(ResolvedJavaMethod method) {
return true;
}

if (AnnotationAccess.isAnnotationPresent(method, DontInline.class)) {
return true;
}

if (!SubstrateOptions.NeverInline.hasBeenSet()) {
return false;
}
Expand Down
Loading