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

PullRequest: graal/21749

Author: mur47x111

common.json

@@ -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 },

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java

@@ -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);
@@ -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
@@ -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");