Skip to content

[JDK-8364586] Adapt JDK-8364187: Make getClassAccessFlagsRaw non-native #11874

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
Aug 4, 2025
Merged

[JDK-8364586] Adapt JDK-8364187: Make getClassAccessFlagsRaw non-native #11874

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
b17a887
Adapt JDK-8364187: Make getClassAccessFlagsRaw non-native
mur47x111 Aug 3, 2025
06a145b
Update galahad JDK
mur47x111 Aug 3, 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
2 changes: 1 addition & 1 deletion common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
"jdks": {
"galahad-jdk": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+9-846", "platformspecific": true, "extrabundles": ["static-libs"]},
"galahad-jdk": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+10-966", "platformspecific": true, "extrabundles": ["static-libs"]},

"oraclejdk17": {"name": "jpg-jdk", "version": "17.0.7", "build_id": "jdk-17.0.7+8", "platformspecific": true, "extrabundles": ["static-libs"]},
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.7+4-jvmci-23.1-b02", "platformspecific": true },
Expand Down
18 changes: 2 additions & 16 deletions ...rc/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ public void run() {
registerMathPlugins(invocationPlugins, target.arch);
registerContinuationPlugins(invocationPlugins, config);
registerCallSitePlugins(invocationPlugins);
registerReflectionPlugins(invocationPlugins, config);
registerReflectionPlugins(invocationPlugins);
registerAESPlugins(invocationPlugins, config);
registerAdler32Plugins(invocationPlugins, config);
registerCRC32Plugins(invocationPlugins, config);
Expand Down Expand Up @@ -508,7 +508,7 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
plugins.register(VolatileCallSite.class, plugin);
}

private static void registerReflectionPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config) {
private static void registerReflectionPlugins(InvocationPlugins plugins) {
Registration r = new Registration(plugins, "jdk.internal.reflect.Reflection");
r.register(new InlineOnlyInvocationPlugin("getCallerClass") {
@Override
Expand All @@ -517,20 +517,6 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
return true;
}
});
r.register(new InvocationPlugin("getClassAccessFlags", Class.class) {
@Override
public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode arg) {
try (HotSpotInvocationPluginHelper helper = new HotSpotInvocationPluginHelper(b, targetMethod, config)) {
ValueNode klass = helper.readKlassFromClass(b.nullCheckedValue(arg));
// Primitive Class case
ValueNode klassNonNull = helper.emitNullReturnGuard(klass, ConstantNode.forInt(Modifier.ABSTRACT | Modifier.FINAL | Modifier.PUBLIC), GraalDirectives.UNLIKELY_PROBABILITY);
// Return (Klass::_access_flags & jvmAccWrittenFlags)
ValueNode accessFlags = helper.readKlassAccessFlags(klassNonNull);
helper.emitFinalReturn(JavaKind.Int, accessFlags);
}
return true;
}
});
}

private static final SpeculationReasonGroup JVMTI_NOTIFY_ALLOCATE_INSTANCE = new SpeculationReasonGroup("JvmtiNotifyAllocateInstance");
Expand Down
Loading