[GR-52365] Adopt addition of ConstantReflectionProvider.identityHashCode

PullRequest: graal/22747

Author: dougxc

common.json

@@ -49,12 +49,12 @@
     "graalvm-ee-25-ea":   {"name": "graalvm-jdk", "version": "25.0.0", "ea": "36", "platformspecific": true },
 
     "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25.0.1+8", "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-25.0.1+8-jvmci-25.1-b10", "platformspecific": true },
-    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-25.0.1+8-jvmci-25.1-b10-debug", "platformspecific": true },
-    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-25.0.1+8-jvmci-25.1-b10-sulong", "platformspecific": true },
-    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-25.0.1+8-jvmci-25.1-b10", "platformspecific": true },
-    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-25.0.1+8-jvmci-25.1-b10-debug", "platformspecific": true },
-    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-25.0.1+8-jvmci-25.1-b10-sulong", "platformspecific": true }
+    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-25.0.1+8-jvmci-25.1-b11", "platformspecific": true },
+    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-25.0.1+8-jvmci-25.1-b11-debug", "platformspecific": true },
+    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-25.0.1+8-jvmci-25.1-b11-sulong", "platformspecific": true },
+    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-25.0.1+8-jvmci-25.1-b11", "platformspecific": true },
+    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-25.0.1+8-jvmci-25.1-b11-debug", "platformspecific": true },
+    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-25.0.1+8-jvmci-25.1-b11-sulong", "platformspecific": true }
   },
 
   "eclipse": {

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotBackendFactory.java

@@ -34,7 +34,6 @@
 import jdk.graal.compiler.debug.Assertions;
 import jdk.graal.compiler.hotspot.meta.HotSpotGraalConstantFieldProvider;
 import jdk.graal.compiler.hotspot.meta.HotSpotHostForeignCallsProvider;
-import jdk.graal.compiler.hotspot.meta.HotSpotIdentityHashCodeProvider;
 import jdk.graal.compiler.hotspot.meta.HotSpotLoweringProvider;
 import jdk.graal.compiler.hotspot.meta.HotSpotMetaAccessExtensionProvider;
 import jdk.graal.compiler.hotspot.meta.HotSpotPlatformConfigurationProvider;
@@ -55,7 +54,6 @@
 import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
 import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
 import jdk.graal.compiler.nodes.loop.LoopsDataProviderImpl;
-import jdk.graal.compiler.nodes.spi.IdentityHashCodeProvider;
 import jdk.graal.compiler.nodes.spi.LoopsDataProvider;
 import jdk.graal.compiler.nodes.spi.Replacements;
 import jdk.graal.compiler.nodes.type.NarrowOopStamp;
@@ -221,12 +219,8 @@ public final HotSpotBackend createBackend(HotSpotGraalRuntimeProvider graalRunti
             try (InitTimer rt = timer("create Bytecode provider")) {
                 bytecodeProvider = createBytecodeProvider(metaAccess, snippetReflection);
             }
-            IdentityHashCodeProvider identityHashCodeProvider;
-            try (InitTimer rt = timer("create IdentityHashCode provider")) {
-                identityHashCodeProvider = createIdentityHashCodeProvider();
-            }
             providers = new HotSpotProviders(metaAccess, codeCache, constantReflection, constantFieldProvider, foreignCalls, lowerer, null, null, registers,
-                            snippetReflection, wordTypes, stampProvider, platformConfigurationProvider, metaAccessExtensionProvider, loopsDataProvider, config, identityHashCodeProvider,
+                            snippetReflection, wordTypes, stampProvider, platformConfigurationProvider, metaAccessExtensionProvider, loopsDataProvider, config,
                             graalRuntime.getReplayCompilationSupport());
 
             try (InitTimer rt = timer("create Replacements provider")) {
@@ -256,10 +250,6 @@ public final HotSpotBackend createBackend(HotSpotGraalRuntimeProvider graalRunti
         }
     }
 
-    protected IdentityHashCodeProvider createIdentityHashCodeProvider() {
-        return new HotSpotIdentityHashCodeProvider();
-    }
-
     protected abstract HotSpotBackend createBackend(GraalHotSpotVMConfig config, HotSpotGraalRuntimeProvider graalRuntime, HotSpotProviders providers);
 
     protected abstract Value[] createNativeABICallerSaveRegisters(GraalHotSpotVMConfig config, RegisterConfig registerConfig);

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotDecoratedBackendFactory.java

@@ -38,7 +38,6 @@
 import jdk.graal.compiler.hotspot.word.HotSpotWordTypes;
 import jdk.graal.compiler.nodes.gc.BarrierSet;
 import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.graal.compiler.nodes.spi.IdentityHashCodeProvider;
 import jdk.graal.compiler.nodes.spi.LoopsDataProvider;
 import jdk.graal.compiler.options.OptionValues;
 import jdk.graal.compiler.phases.tiers.CompilerConfiguration;
@@ -118,11 +117,6 @@ protected HotSpotSnippetReflectionProvider createSnippetReflection(HotSpotGraalR
         return delegate.createSnippetReflection(runtime, constantReflection, wordTypes);
     }
 
-    @Override
-    protected IdentityHashCodeProvider createIdentityHashCodeProvider() {
-        return delegate.createIdentityHashCodeProvider();
-    }
-
     @Override
     protected LoopsDataProvider createLoopsDataProvider() {
         return delegate.createLoopsDataProvider();

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JVMCIVersionCheck.java

@@ -58,8 +58,8 @@ public final class JVMCIVersionCheck {
     // Checkstyle: stop stable iteration order check
     private static final Map<String, Map<String, Version>> JVMCI_MIN_VERSIONS = Map.of(
                     "25", Map.of(
-                                    "Oracle Corporation", createLabsJDKVersion("25.0.1+8", "25.1", 10),
-                                    DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("25.0.1+8", "25.1", 10)));
+                                    "Oracle Corporation", createLabsJDKVersion("25.0.1+8", "25.1", 11),
+                                    DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("25.0.1+8", "25.1", 11)));
     // Checkstyle: resume stable iteration order check
 
     private static final int NA = 0;

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/SnippetResolvedJavaType.java

@@ -174,12 +174,6 @@ public ResolvedJavaType lookupType(UnresolvedJavaType unresolvedJavaType, boolea
         throw new NoClassDefFoundError();
     }
 
-    @SuppressWarnings("deprecation")
-    @Override
-    public ResolvedJavaType getHostClass() {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public boolean isInstance(JavaConstant obj) {
         if (obj instanceof SnippetObjectConstant) {

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/SymbolicSnippetEncoder.java

@@ -362,7 +362,7 @@ private boolean verifySnippetEncodeDecode(DebugContext debug, ResolvedJavaMethod
                         originalProvider.getConstantFieldProvider(), originalProvider.getForeignCalls(), originalProvider.getLowerer(), null, originalProvider.getSuites(),
                         originalProvider.getRegisters(), originalProvider.getSnippetReflection(), originalProvider.getWordTypes(), originalProvider.getStampProvider(),
                         originalProvider.getPlatformConfigurationProvider(), originalProvider.getMetaAccessExtensionProvider(), originalProvider.getLoopsDataProvider(), originalProvider.getConfig(),
-                        originalProvider.getIdentityHashCodeProvider(), originalProvider.getReplayCompilationSupport());
+                        originalProvider.getReplayCompilationSupport());
         HotSpotSnippetReplacementsImpl filteringReplacements = new HotSpotSnippetReplacementsImpl(newProviders,
                         originalProvider.getReplacements().getDefaultReplacementBytecodeProvider(), originalProvider.getCodeCache().getTarget());
         filteringReplacements.setGraphBuilderPlugins(originalProvider.getReplacements().getGraphBuilderPlugins());
@@ -647,6 +647,11 @@ public JavaConstant asJavaClass(ResolvedJavaType type) {
         public Constant asObjectHub(ResolvedJavaType type) {
             return constantReflection.asObjectHub(type);
         }
+
+        @Override
+        public Integer identityHashCode(JavaConstant constant) {
+            return constantReflection.identityHashCode(constant);
+        }
     }
 
     class SnippetObjectFilter {

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

@@ -31,7 +31,6 @@
 import jdk.graal.compiler.hotspot.replaycomp.ReplayCompilationSupport;
 import jdk.graal.compiler.hotspot.word.HotSpotWordTypes;
 import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.graal.compiler.nodes.spi.IdentityHashCodeProvider;
 import jdk.graal.compiler.nodes.spi.LoopsDataProvider;
 import jdk.graal.compiler.nodes.spi.LoweringProvider;
 import jdk.graal.compiler.nodes.spi.PlatformConfigurationProvider;
@@ -74,10 +73,9 @@ public HotSpotProviders(MetaAccessProvider metaAccess,
                     MetaAccessExtensionProvider metaAccessExtensionProvider,
                     LoopsDataProvider loopsDataProvider,
                     GraalHotSpotVMConfig config,
-                    IdentityHashCodeProvider identityHashCodeProvider,
                     ReplayCompilationSupport replayCompilationSupport) {
         super(metaAccess, codeCache, constantReflection, constantField, foreignCalls, lowerer, replacements, stampProvider, platformConfigurationProvider, metaAccessExtensionProvider,
-                        snippetReflection, wordTypes, loopsDataProvider, identityHashCodeProvider);
+                        snippetReflection, wordTypes, loopsDataProvider);
         this.suites = suites;
         this.registers = registers;
         this.config = config;
@@ -125,7 +123,7 @@ public HotSpotProviders copyWith(ConstantReflectionProvider substitution) {
         return new HotSpotProviders(getMetaAccess(), getCodeCache(), substitution, getConstantFieldProvider(), getForeignCalls(), getLowerer(), getReplacements(), getSuites(),
                         getRegisters(), getSnippetReflection(), getWordTypes(), getStampProvider(), getPlatformConfigurationProvider(), getMetaAccessExtensionProvider(),
                         getLoopsDataProvider(),
-                        config, getIdentityHashCodeProvider(), getReplayCompilationSupport());
+                        config, getReplayCompilationSupport());
     }
 
     @Override
@@ -134,22 +132,22 @@ public HotSpotProviders copyWith(ConstantFieldProvider substitution) {
                         getSuites(),
                         getRegisters(), getSnippetReflection(), getWordTypes(), getStampProvider(), getPlatformConfigurationProvider(), getMetaAccessExtensionProvider(),
                         getLoopsDataProvider(),
-                        config, getIdentityHashCodeProvider(), getReplayCompilationSupport());
+                        config, getReplayCompilationSupport());
     }
 
     @Override
     public HotSpotProviders copyWith(Replacements substitution) {
         return new HotSpotProviders(getMetaAccess(), getCodeCache(), getConstantReflection(), getConstantFieldProvider(), getForeignCalls(), getLowerer(), substitution,
                         getSuites(), getRegisters(), getSnippetReflection(), getWordTypes(), getStampProvider(), getPlatformConfigurationProvider(),
                         getMetaAccessExtensionProvider(),
-                        getLoopsDataProvider(), config, getIdentityHashCodeProvider(), getReplayCompilationSupport());
+                        getLoopsDataProvider(), config, getReplayCompilationSupport());
     }
 
     public HotSpotProviders copyWith() {
         return new HotSpotProviders(getMetaAccess(), getCodeCache(), getConstantReflection(), getConstantFieldProvider(), getForeignCalls(), getLowerer(), getReplacements(),
                         getSuites(), getRegisters(), getSnippetReflection(), getWordTypes(), getStampProvider(), getPlatformConfigurationProvider(), getMetaAccessExtensionProvider(),
                         getLoopsDataProvider(),
-                        config, getIdentityHashCodeProvider(), getReplayCompilationSupport());
+                        config, getReplayCompilationSupport());
     }
 
     public void setSuites(HotSpotSuitesProvider suites) {

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

@@ -2228,7 +2228,6 @@ private void emitCheckForDeclaringClassChange(ResolvedJavaType declaringClass, V
      */
     protected void emitCheckForInvokeSuperSpecial(ValueNode[] args) {
         ResolvedJavaType callingClass = method.getDeclaringClass();
-        callingClass = getHostClass(callingClass);
         if (callingClass.isInterface()) {
             args[0] = emitIncompatibleClassChangeCheck(args[0], callingClass);
         }
@@ -2246,12 +2245,6 @@ protected ValueNode emitIncompatibleClassChangeCheck(ValueNode object, ResolvedJ
         return append(PiNode.create(object, StampFactory.object(checkedTypeRef, true), guardingNode));
     }
 
-    @SuppressWarnings("deprecation")
-    private static ResolvedJavaType getHostClass(ResolvedJavaType type) {
-        ResolvedJavaType hostClass = type.getHostClass();
-        return hostClass != null ? hostClass : type;
-    }
-
     protected JavaTypeProfile getProfileForInvoke(InvokeKind invokeKind) {
         if (invokeKind.isIndirect() && profilingInfo != null && this.optimisticOpts.useTypeCheckHints(getOptions())) {
             return profilingInfo.getTypeProfile(bci());

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/BytecodeParser.java

@@ -60,6 +60,4 @@ public interface CoreProviders {
     CodeCacheProvider getCodeCache();
 
     SnippetReflectionProvider getSnippetReflection();
-
-    IdentityHashCodeProvider getIdentityHashCodeProvider();
 }