Magic accessor no longer exists from JDK23 onwards.

Author: rakachan

espresso-shared/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/JavaVersion.java

@@ -46,6 +46,8 @@ public static final class VersionRange {
 
         public static final VersionRange ALL = between(0, LATEST_SUPPORTED);
         public static final VersionRange VERSION_9_TO_21 = between(9, 21);
+        public static final VersionRange VERSION_9_TO_23 = between(9, 23);
+        public static final VersionRange VERSION_22_TO_23 = between(22, 23);
 
         private final int low;
         private final int high;

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/ClassRegistry.java

@@ -582,14 +582,16 @@ private ObjectKlass createKlass(EspressoContext context, ParserKlass parserKlass
              *
              * In turn, this ensures that only these classes may be magic accessors.
              */
-            if (!env.loaderIsBoot(getClassLoader()) &&
-                            env.isReflectPackage(superKlass.getRuntimePackage()) &&
-                            !env.loaderIsReflection(getClassLoader())) {
-                throw EspressoClassLoadingException.illegalAccessError(
-                                String.format("class %s loaded by %s cannot access reflection superclass %s",
-                                                klass.getExternalName(),
-                                                loaderDesc(env, context.getMeta(), getClassLoader()),
-                                                superKlass.getExternalName()));
+            if (context.getJavaVersion().java23OrEarlier()) {
+                if (!env.loaderIsBoot(getClassLoader()) &&
+                                env.isReflectPackage(superKlass.getRuntimePackage()) &&
+                                !env.loaderIsReflection(getClassLoader())) {
+                    throw EspressoClassLoadingException.illegalAccessError(
+                                    String.format("class %s loaded by %s cannot access reflection superclass %s",
+                                                    klass.getExternalName(),
+                                                    loaderDesc(env, context.getMeta(), getClassLoader()),
+                                                    superKlass.getExternalName()));
+                }
             }
             if (!Klass.checkAccess(superKlass, klass)) {
                 StringBuilder sb = new StringBuilder().append("class ").append(klass.getExternalName()).append(" cannot access its superclass ").append(superKlass.getExternalName());

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/Klass.java

@@ -1898,7 +1898,8 @@ public final Symbol<Name> getSymbolicRuntimePackage() {
 
     @Override
     public final boolean isMagicAccessor() {
-        if (getMeta().sun_reflect_MagicAccessorImpl != null) {
+        if (getJavaVersion().java23OrEarlier()) {
+            assert getMeta().sun_reflect_MagicAccessorImpl != null;
             return getMeta().sun_reflect_MagicAccessorImpl.isAssignableFrom(this);
         }
         return false;

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/meta/Meta.java

@@ -31,11 +31,13 @@
 import static com.oracle.truffle.espresso.classfile.JavaVersion.VersionRange.VERSION_21_OR_HIGHER;
 import static com.oracle.truffle.espresso.classfile.JavaVersion.VersionRange.VERSION_21_OR_LOWER;
 import static com.oracle.truffle.espresso.classfile.JavaVersion.VersionRange.VERSION_22_OR_HIGHER;
+import static com.oracle.truffle.espresso.classfile.JavaVersion.VersionRange.VERSION_22_TO_23;
 import static com.oracle.truffle.espresso.classfile.JavaVersion.VersionRange.VERSION_24_OR_LOWER;
 import static com.oracle.truffle.espresso.classfile.JavaVersion.VersionRange.VERSION_25_OR_HIGHER;
 import static com.oracle.truffle.espresso.classfile.JavaVersion.VersionRange.VERSION_8_OR_LOWER;
 import static com.oracle.truffle.espresso.classfile.JavaVersion.VersionRange.VERSION_9_OR_HIGHER;
 import static com.oracle.truffle.espresso.classfile.JavaVersion.VersionRange.VERSION_9_TO_21;
+import static com.oracle.truffle.espresso.classfile.JavaVersion.VersionRange.VERSION_9_TO_23;
 import static com.oracle.truffle.espresso.classfile.JavaVersion.VersionRange.between;
 import static com.oracle.truffle.espresso.classfile.JavaVersion.VersionRange.higher;
 import static com.oracle.truffle.espresso.classfile.JavaVersion.VersionRange.lower;
@@ -898,10 +900,11 @@ public Meta(EspressoContext context) {
         sun_reflect_MagicAccessorImpl = diff() //
                         .klass(VERSION_8_OR_LOWER, Types.sun_reflect_MagicAccessorImpl) //
                         .klass(VERSION_9_TO_21, Types.jdk_internal_reflect_MagicAccessorImpl) //
+                        .klass(VERSION_22_TO_23, Types.jdk_internal_reflect_SerializationConstructorAccessorImpl) //
                         .notRequiredKlass();
         sun_reflect_DelegatingClassLoader = diff() //
                         .klass(VERSION_8_OR_LOWER, Types.sun_reflect_DelegatingClassLoader) //
-                        .klass(VERSION_9_TO_21, Types.jdk_internal_reflect_DelegatingClassLoader) //
+                        .klass(VERSION_9_TO_23, Types.jdk_internal_reflect_DelegatingClassLoader) //
                         .notRequiredKlass();
 
         sun_reflect_MethodAccessorImpl = diff() //