Automatic merge of master into galahad

OracleLabsAutomation · OracleLabsAutomation · commit 47af3be923b6 · 2025-08-13T17:45:18.000Z
diff --git a/common.json b/common.json
@@ -53,13 +53,13 @@
     "labsjdk-ee-25Debug": {"name": "labsjdk",   "version": "ee-25+30-jvmci-b01-debug", "platformspecific": true },
     "labsjdk-ee-25-llvm": {"name": "labsjdk",   "version": "ee-25+30-jvmci-b01-sulong", "platformspecific": true },
 
-    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "26",      "build_id": "jdk-26+9", "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-26+9-jvmci-b01", "platformspecific": true },
-    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-26+9-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-26+9-jvmci-b01-sulong", "platformspecific": true },
-    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-26+9-jvmci-b01", "platformspecific": true },
-    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-26+9-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-26+9-jvmci-b01-sulong", "platformspecific": true }
+    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "26",      "build_id": "jdk-26+10", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-26+10-jvmci-b01", "platformspecific": true },
+    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-26+10-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-26+10-jvmci-b01-sulong", "platformspecific": true },
+    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-26+10-jvmci-b01", "platformspecific": true },
+    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-26+10-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-26+10-jvmci-b01-sulong", "platformspecific": true }
   },
 
   "eclipse": {
diff --git a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JVMCIVersionCheck.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JVMCIVersionCheck.java
@@ -57,8 +57,8 @@ public final class JVMCIVersionCheck {
     // Checkstyle: stop stable iteration order check
     private static final Map<String, Map<String, Version>> JVMCI_MIN_VERSIONS = Map.of(
                     "26", Map.of(
-                                    "Oracle Corporation", createLabsJDKVersion("26+9", 1),
-                                    DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("26+9", 1)));
+                                    "Oracle Corporation", createLabsJDKVersion("26+10", 1),
+                                    DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("26+10", 1)));
     // Checkstyle: resume stable iteration order check
 
     private static final int NA = 0;
diff --git a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/UnimplementedGraalIntrinsics.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/UnimplementedGraalIntrinsics.java
@@ -87,6 +87,8 @@ private static void add(Collection<String> c, String... elements) {
 
     public UnimplementedGraalIntrinsics(Architecture arch) {
         add(toBeInvestigated, // @formatter:off
+                        // JDK-8360559: Optimize Math.sinh for x86 64 bit platforms
+                        "java/lang/Math.sinh(D)D",
                         // JDK-8342103: C2 compiler support for Float16 type and associated
                         // scalar operations
                         "jdk/internal/vm/vector/Float16Math.fma(Ljava/lang/Class;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljdk/internal/vm/vector/Float16Math$TernaryOperator;)Ljava/lang/Object;",
diff --git a/espresso-shared/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/JavaVersion.java b/espresso-shared/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/JavaVersion.java
@@ -43,6 +43,7 @@ public static final class VersionRange {
         public static final VersionRange VERSION_22_OR_HIGHER = higher(22);
         public static final VersionRange VERSION_24_OR_LOWER = lower(24);
         public static final VersionRange VERSION_25_OR_HIGHER = higher(25);
+        public static final VersionRange VERSION_26_OR_HIGHER = higher(26);
 
         public static final VersionRange ALL = between(0, LATEST_SUPPORTED);
         public static final VersionRange VERSION_9_TO_21 = between(9, 21);
@@ -211,6 +212,14 @@ public boolean java25OrLater() {
         return version >= 25;
     }
 
+    public boolean java25OrEarlier() {
+        return version <= 25;
+    }
+
+    public boolean java26OrLater() {
+        return version >= 26;
+    }
+
     public boolean inRange(int low, int high) {
         return version >= low && version <= high;
     }
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/descriptors/EspressoSymbols.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/descriptors/EspressoSymbols.java
@@ -612,6 +612,7 @@ public static class Names {
         public static final Symbol<Name> componentType = SYMBOLS.putName("componentType");
         public static final Symbol<Name> protectionDomain = SYMBOLS.putName("protectionDomain");
         public static final Symbol<Name> modifiers = SYMBOLS.putName("modifiers");
+        public static final Symbol<Name> classFileAccessFlags = SYMBOLS.putName("classFileAccessFlags");
         public static final Symbol<Name> primitive = SYMBOLS.putName("primitive");
         public static final Symbol<Name> signers = SYMBOLS.putName("signers");
         // j.l.ClassLoader
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/libs/libjava/impl/Target_java_lang_Class.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/libs/libjava/impl/Target_java_lang_Class.java
@@ -186,6 +186,7 @@ public static boolean isRecord0(@JavaType(Class.class) StaticObject self, @Injec
     }
 
     @Substitution(hasReceiver = true)
+    // Method no longer exists in 26.
     public static int getClassAccessFlagsRaw0(@JavaType(Class.class) StaticObject self, @Inject EspressoContext ctx) {
         return ctx.getVM().JVM_GetClassAccessFlags(self);
     }
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/libs/libjava/impl/Target_jdk_internal_reflect_Reflection.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/libs/libjava/impl/Target_jdk_internal_reflect_Reflection.java
@@ -29,11 +29,12 @@
 import com.oracle.truffle.espresso.substitutions.Inject;
 import com.oracle.truffle.espresso.substitutions.JavaType;
 import com.oracle.truffle.espresso.substitutions.Substitution;
+import com.oracle.truffle.espresso.substitutions.VersionFilter;
 import com.oracle.truffle.espresso.vm.VM;
 
 @EspressoSubstitutions(type = "Ljdk/internal/reflect/Reflection;", group = LibJava.class)
 public final class Target_jdk_internal_reflect_Reflection {
-    @Substitution
+    @Substitution(languageFilter = VersionFilter.Java25OrEarlier.class)
     public static int getClassAccessFlags(@JavaType(Class.class) StaticObject cls, @Inject EspressoContext ctx) {
         return ctx.getVM().JVM_GetClassAccessFlags(cls);
     }
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/meta/Meta.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/meta/Meta.java
@@ -34,6 +34,7 @@
 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_26_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;
@@ -118,6 +119,9 @@ public Meta(EspressoContext context) {
         java_lang_Class_modifiers = diff() //
                         .field(VERSION_25_OR_HIGHER, Names.modifiers, Types._char) //
                         .notRequiredField(java_lang_Class);
+        java_lang_Class_classFileAccessFlags = diff() //
+                        .field(VERSION_26_OR_HIGHER, Names.classFileAccessFlags, Types._char) //
+                        .notRequiredField(java_lang_Class);
         java_lang_Class_primitive = diff() //
                         .field(VERSION_25_OR_HIGHER, Names.primitive, Types._boolean) //
                         .notRequiredField(java_lang_Class);
@@ -1391,6 +1395,7 @@ private DiffVersionLoadHelper diff() {
     public final Field java_lang_Class_module;
     public final Field java_lang_Class_classLoader;
     public final Field java_lang_Class_modifiers;
+    public final Field java_lang_Class_classFileAccessFlags;
     public final Field java_lang_Class_primitive;
     public final Field sun_reflect_ConstantPool_constantPoolOop;
     public final ArrayKlass java_lang_Class_array;
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/GuestAllocator.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/GuestAllocator.java
@@ -178,6 +178,10 @@ public StaticObject createClass(Klass klass) {
             meta.java_lang_Class_modifiers.setChar(newObj, (char) klass.getClassModifiers());
             meta.java_lang_Class_primitive.setBoolean(newObj, klass.isPrimitive());
         }
+        if (lang.getJavaVersion().java26OrLater()) {
+            assert meta.java_lang_Class_classFileAccessFlags != null;
+            meta.java_lang_Class_classFileAccessFlags.setChar(newObj, (char) VM.getClassAccessFlags(klass));
+        }
         return trackAllocation(klass, newObj);
     }
 
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/VersionFilter.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/VersionFilter.java
@@ -225,4 +225,16 @@ public boolean isValidFor(JavaVersion version) {
             return version.java25OrLater();
         }
     }
+
+    final class Java25OrEarlier implements VersionFilter {
+        public static final Java25OrEarlier INSTANCE = new Java25OrEarlier();
+
+        private Java25OrEarlier() {
+        }
+
+        @Override
+        public boolean isValidFor(JavaVersion version) {
+            return version.java25OrEarlier();
+        }
+    }
 }
diff --git a/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/vm/VM.java b/espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/vm/VM.java
@@ -1378,6 +1378,10 @@ public boolean JVM_IsRecord(@JavaType(Class.class) StaticObject self) {
     @VmImpl(isJni = true)
     public int JVM_GetClassAccessFlags(@JavaType(Class.class) StaticObject clazz) {
         Klass klass = clazz.getMirrorKlass(getMeta());
+        return getClassAccessFlags(klass);
+    }
+
+    public static int getClassAccessFlags(Klass klass) {
         if (klass.isPrimitive()) {
             final int primitiveFlags = ACC_ABSTRACT | ACC_FINAL | ACC_PUBLIC;
             assert klass.getModifiers() == primitiveFlags;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/container/ContainerLibrary.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/container/ContainerLibrary.java
@@ -64,29 +64,29 @@
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/os/linux/os_linux.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/os/linux/os_linux.inline.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/os/posix/include/jvm_md.h")
-@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+6/src/hotspot/os/posix/os_posix.cpp")
+@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+10/src/hotspot/os/posix/os_posix.cpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/os/posix/os_posix.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/os/posix/os_posix.inline.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/share/memory/allocation.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/share/memory/allocation.inline.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/share/memory/allStatic.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+5/src/hotspot/share/nmt/memTag.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+6/src/hotspot/share/runtime/os.cpp")
-@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+6/src/hotspot/share/runtime/os.hpp")
+@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+10/src/hotspot/share/runtime/os.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/share/runtime/os.inline.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/share/utilities/checkedCast.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/share/utilities/compilerWarnings_gcc.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/share/utilities/compilerWarnings.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+9/src/hotspot/share/utilities/globalDefinitions_gcc.hpp")
-@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+9/src/hotspot/share/utilities/globalDefinitions.hpp")
+@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+10/src/hotspot/share/utilities/globalDefinitions.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/share/utilities/macros.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+9/src/hotspot/share/utilities/ostream.cpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+9/src/hotspot/share/utilities/ostream.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/share/utilities/permitForbiddenFunctions.hpp")
 // The following annotations are for files in `src/svm`, which are completely customized for SVM
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/share/logging/log.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/share/memory/allocation.cpp")
-@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+9/src/hotspot/share/runtime/globals.hpp")
+@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+10/src/hotspot/share/runtime/globals.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+9/src/hotspot/share/utilities/debug.cpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+4/src/hotspot/share/utilities/debug.hpp")
 public class ContainerLibrary {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java
@@ -397,8 +397,8 @@ public final class DynamicHub implements AnnotatedElement, java.lang.reflect.Typ
 
     @Platforms(Platform.HOSTED_ONLY.class)
     public DynamicHub(Class<?> hostedJavaClass, String name, byte hubType, ReferenceType referenceType, DynamicHub superType,
-                    DynamicHub componentHub, String sourceFileName, int modifiers, short flags, ClassLoader classLoader,
-                    Class<?> nestHost, String simpleBinaryName, Object declaringClass, String signature, int layerId) {
+                    DynamicHub componentHub, String sourceFileName, int modifiers, int classFileAccessFlags, short flags,
+                    ClassLoader classLoader, Class<?> nestHost, String simpleBinaryName, Object declaringClass, String signature, int layerId) {
         this.hostedJavaClass = hostedJavaClass;
         this.name = name;
         this.hubType = hubType;
@@ -412,7 +412,7 @@ public DynamicHub(Class<?> hostedJavaClass, String name, byte hubType, Reference
 
         Object loader = PredefinedClassesSupport.isPredefined(hostedJavaClass) ? NO_CLASS_LOADER : classLoader;
         this.companion = DynamicHubCompanion.createHosted(hostedJavaClass.getModule(), superType, sourceFileName,
-                        modifiers, loader, nestHost, simpleBinaryName, declaringClass, signature);
+                        modifiers, classFileAccessFlags, loader, nestHost, simpleBinaryName, declaringClass, signature);
     }
 
     /**
@@ -432,7 +432,7 @@ public DynamicHub(Class<?> hostedJavaClass, String name, byte hubType, Reference
      */
     @NeverInline("Fields of DynamicHub are immutable. Immutable reads could float above ANY_LOCATION writes.")
     public static DynamicHub allocate(String name, DynamicHub superHub, Object interfacesEncoding, DynamicHub componentHub, String sourceFileName,
-                    int modifiers, short flags, ClassLoader classLoader, Class<?> nestHost, String simpleBinaryName, Module module,
+                    int modifiers, int classFileAccessFlags, short flags, ClassLoader classLoader, Class<?> nestHost, String simpleBinaryName, Module module,
                     Object declaringClass, String signature, int typeID,
                     short numClassTypes,
                     short typeIDDepth,
@@ -457,7 +457,8 @@ public static DynamicHub allocate(String name, DynamicHub superHub, Object inter
             }
         }
 
-        DynamicHubCompanion companion = DynamicHubCompanion.createAtRuntime(module, superHub, sourceFileName, modifiers, classLoader, nestHost, simpleBinaryName, declaringClass, signature);
+        DynamicHubCompanion companion = DynamicHubCompanion.createAtRuntime(module, superHub, sourceFileName, modifiers, classFileAccessFlags, classLoader, nestHost, simpleBinaryName, declaringClass,
+                        signature);
 
         /* Always allow unsafe allocation for classes that were loaded at run-time. */
         companion.canUnsafeAllocate = true;
@@ -1038,22 +1039,24 @@ public int getModifiers() {
         return companion.modifiers;
     }
 
-    public int getClassAccessFlags() {
+    @Substitute
+    int getClassFileAccessFlags() {
         if (ImageLayerBuildingSupport.buildingImageLayer()) {
+            /*
+             * Currently, layered images do not use the Class#classFileAccessFlags. This will be
+             * addressed by GR-68631.
+             */
             int classAccessFlags = 0;
-            for (var reflectionMetadata : LayeredReflectionMetadataSingleton.singletons()) {
-                classAccessFlags |= getClassAccessFlags(reflectionMetadata.getReflectionMetadata(this));
+            for (var reflectionMetadataSingleton : LayeredReflectionMetadataSingleton.singletons()) {
+                ReflectionMetadata reflectionMetadata = reflectionMetadataSingleton.getReflectionMetadata(this);
+                classAccessFlags |= reflectionMetadata != null ? (reflectionMetadata.classFlags & CLASS_ACCESS_FLAGS_MASK) : companion.modifiers;
             }
             return classAccessFlags;
         } else {
-            return getClassAccessFlags(reflectionMetadata());
+            return companion.classFileAccessFlags;
         }
     }
 
-    private int getClassAccessFlags(ReflectionMetadata reflectionMetadata) {
-        return reflectionMetadata != null ? (reflectionMetadata.classFlags & CLASS_ACCESS_FLAGS_MASK) : companion.modifiers;
-    }
-
     @Substitute
     private DynamicHub getComponentType() {
         return componentType;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHubCompanion.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHubCompanion.java
@@ -67,6 +67,12 @@ public final class DynamicHubCompanion {
     /** The {@link Modifier modifiers} of this class. */
     final int modifiers;
 
+    /**
+     * The access flags of this class as they were in the class's bytecode, including the original
+     * setting of ACC_SUPER.
+     */
+    final int classFileAccessFlags;
+
     /** The class that serves as the host for the nest. All nestmates have the same host. */
     final Class<?> nestHost;
 
@@ -146,24 +152,25 @@ public final class DynamicHubCompanion {
     @Stable boolean canUnsafeAllocate;
 
     @Platforms(Platform.HOSTED_ONLY.class)
-    static DynamicHubCompanion createHosted(Module module, DynamicHub superHub, String sourceFileName, int modifiers,
+    static DynamicHubCompanion createHosted(Module module, DynamicHub superHub, String sourceFileName, int modifiers, int classFileAccessFlags,
                     Object classLoader, Class<?> nestHost, String simpleBinaryName, Object declaringClass, String signature) {
 
-        return new DynamicHubCompanion(module, superHub, sourceFileName, modifiers, classLoader, nestHost, simpleBinaryName, declaringClass, signature);
+        return new DynamicHubCompanion(module, superHub, sourceFileName, modifiers, classFileAccessFlags, classLoader, nestHost, simpleBinaryName, declaringClass, signature);
     }
 
-    static DynamicHubCompanion createAtRuntime(Module module, DynamicHub superHub, String sourceFileName, int modifiers,
+    static DynamicHubCompanion createAtRuntime(Module module, DynamicHub superHub, String sourceFileName, int modifiers, int classFileAccessFlags,
                     ClassLoader classLoader, Class<?> nestHost, String simpleBinaryName, Object declaringClass, String signature) {
         assert RuntimeClassLoading.isSupported();
-        return new DynamicHubCompanion(module, superHub, sourceFileName, modifiers, classLoader, nestHost, simpleBinaryName, declaringClass, signature);
+        return new DynamicHubCompanion(module, superHub, sourceFileName, modifiers, classFileAccessFlags, classLoader, nestHost, simpleBinaryName, declaringClass, signature);
     }
 
-    private DynamicHubCompanion(Module module, DynamicHub superHub, String sourceFileName, int modifiers,
+    private DynamicHubCompanion(Module module, DynamicHub superHub, String sourceFileName, int modifiers, int classFileAccessFlags,
                     Object classLoader, Class<?> nestHost, String simpleBinaryName, Object declaringClass, String signature) {
         this.module = module;
         this.superHub = superHub;
         this.sourceFileName = sourceFileName;
         this.modifiers = modifiers;
+        this.classFileAccessFlags = classFileAccessFlags;
         this.nestHost = nestHost;
         this.simpleBinaryName = simpleBinaryName;
         this.declaringClass = declaringClass;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/registry/AbstractRuntimeClassRegistry.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/registry/AbstractRuntimeClassRegistry.java
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_internal_reflect_Reflection.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_internal_reflect_Reflection.java
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java

Original file line number	Diff line number	Diff line change
`@@ -186,6 +186,7 @@ public static boolean isRecord0(@JavaType(Class.class) StaticObject self, @Injec`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`@Substitution(hasReceiver = true)`
	`189`	`+ // Method no longer exists in 26.`
`189`	`190`	`public static int getClassAccessFlagsRaw0(@JavaType(Class.class) StaticObject self, @Inject EspressoContext ctx) {`
`190`	`191`	`return ctx.getVM().JVM_GetClassAccessFlags(self);`
`191`	`192`	`}`
Original file line number	Diff line number	Diff line change
`@@ -178,6 +178,10 @@ public StaticObject createClass(Klass klass) {`
`178`	`178`	`meta.java_lang_Class_modifiers.setChar(newObj, (char) klass.getClassModifiers());`
`179`	`179`	`meta.java_lang_Class_primitive.setBoolean(newObj, klass.isPrimitive());`
`180`	`180`	`}`
	`181`	`+ if (lang.getJavaVersion().java26OrLater()) {`
	`182`	`+ assert meta.java_lang_Class_classFileAccessFlags != null;`
	`183`	`+ meta.java_lang_Class_classFileAccessFlags.setChar(newObj, (char) VM.getClassAccessFlags(klass));`
	`184`	`+ }`
`181`	`185`	`return trackAllocation(klass, newObj);`
`182`	`186`	`}`
`183`	`187`
Original file line number	Diff line number	Diff line change
`@@ -225,4 +225,16 @@ public boolean isValidFor(JavaVersion version) {`
`225`	`225`	`return version.java25OrLater();`
`226`	`226`	`}`
`227`	`227`	`}`
	`228`	`+`
	`229`	`+ final class Java25OrEarlier implements VersionFilter {`
	`230`	`+ public static final Java25OrEarlier INSTANCE = new Java25OrEarlier();`
	`231`	`+`
	`232`	`+ private Java25OrEarlier() {`
	`233`	`+ }`
	`234`	`+`
	`235`	`+ @Override`
	`236`	`+ public boolean isValidFor(JavaVersion version) {`
	`237`	`+ return version.java25OrEarlier();`
	`238`	`+ }`
	`239`	`+ }`
`228`	`240`	`}`