src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/HotSpotClassSubstitutions.java

*** 23,32 ****
--- 23,33 ----
  
  
  package org.graalvm.compiler.hotspot.replacements;
  
  import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG;
+ import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfigBase.INJECTED_METAACCESS;
  import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.ARRAY_KLASS_COMPONENT_MIRROR;
  import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.KLASS_ACCESS_FLAGS_LOCATION;
  import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.KLASS_MODIFIER_FLAGS_LOCATION;
  import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.KLASS_SUPER_KLASS_LOCATION;
  import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.arrayKlassComponentMirrorOffset;
*** 36,50 ****
--- 37,56 ----
  import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.klassSuperKlassOffset;
  
  import java.lang.reflect.Modifier;
  
  import org.graalvm.compiler.api.replacements.ClassSubstitution;
+ import org.graalvm.compiler.api.replacements.Fold;
  import org.graalvm.compiler.api.replacements.MethodSubstitution;
  import org.graalvm.compiler.hotspot.word.KlassPointer;
+ import org.graalvm.compiler.nodes.ConstantNode;
  import org.graalvm.compiler.nodes.PiNode;
  import org.graalvm.compiler.nodes.SnippetAnchorNode;
  
+ import jdk.vm.ci.meta.MetaAccessProvider;
+ import jdk.vm.ci.meta.ResolvedJavaType;
+ 
  // JaCoCo Exclude
  
  /**
   * Substitutions for {@link java.lang.Class} methods.
   */
*** 90,108 ****
      public static boolean isPrimitive(final Class<?> thisObj) {
          KlassPointer klass = ClassGetHubNode.readClass(thisObj);
          return klass.isNull();
      }
  
      @MethodSubstitution(isStatic = false)
      public static Class<?> getSuperclass(final Class<?> thisObj) {
          KlassPointer klass = ClassGetHubNode.readClass(thisObj);
          if (!klass.isNull()) {
              KlassPointer klassNonNull = ClassGetHubNode.piCastNonNull(klass, SnippetAnchorNode.anchor());
              int accessFlags = klassNonNull.readInt(klassAccessFlagsOffset(INJECTED_VMCONFIG), KLASS_ACCESS_FLAGS_LOCATION);
              if ((accessFlags & Modifier.INTERFACE) == 0) {
                  if (klassIsArray(klassNonNull)) {
!                     return Object.class;
                  } else {
                      KlassPointer superKlass = klassNonNull.readKlassPointer(klassSuperKlassOffset(INJECTED_VMCONFIG), KLASS_SUPER_KLASS_LOCATION);
                      if (superKlass.isNull()) {
                          return null;
                      } else {
--- 96,119 ----
      public static boolean isPrimitive(final Class<?> thisObj) {
          KlassPointer klass = ClassGetHubNode.readClass(thisObj);
          return klass.isNull();
      }
  
+     @Fold
+     public static ResolvedJavaType getObjectType(@Fold.InjectedParameter MetaAccessProvider metaAccesss) {
+         return metaAccesss.lookupJavaType(Object.class);
+     }
+ 
      @MethodSubstitution(isStatic = false)
      public static Class<?> getSuperclass(final Class<?> thisObj) {
          KlassPointer klass = ClassGetHubNode.readClass(thisObj);
          if (!klass.isNull()) {
              KlassPointer klassNonNull = ClassGetHubNode.piCastNonNull(klass, SnippetAnchorNode.anchor());
              int accessFlags = klassNonNull.readInt(klassAccessFlagsOffset(INJECTED_VMCONFIG), KLASS_ACCESS_FLAGS_LOCATION);
              if ((accessFlags & Modifier.INTERFACE) == 0) {
                  if (klassIsArray(klassNonNull)) {
!                     return ConstantNode.forClass(getObjectType(INJECTED_METAACCESS));
                  } else {
                      KlassPointer superKlass = klassNonNull.readKlassPointer(klassSuperKlassOffset(INJECTED_VMCONFIG), KLASS_SUPER_KLASS_LOCATION);
                      if (superKlass.isNull()) {
                          return null;
                      } else {