Merge community-backports-jdk21u master into mandrel/23.1

2025-10-07 merge edition

Author: zakkak

compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/PEGraphDecoderTest.java

@@ -231,7 +231,7 @@ private StructuredGraph test(String methodName, EconomicMap<ResolvedJavaMethod,
             graphBuilderConfig = editGraphBuilderConfiguration(graphBuilderConfig);
             registerPlugins(graphBuilderConfig.getPlugins().getInvocationPlugins());
             targetGraph = new StructuredGraph.Builder(debug.getOptions(), debug, AllowAssumptions.YES).method(testMethod).build();
-            CachingPEGraphDecoder decoder = new CachingPEGraphDecoder(getTarget().arch, targetGraph, getProviders(), graphBuilderConfig, OptimisticOptimizations.NONE,
+            CachingPEGraphDecoder decoder = new CachingPEGraphDecoder(getTarget().arch, targetGraph, getProviders(), getProviders(), graphBuilderConfig, OptimisticOptimizations.NONE,
                             null, null, new InlineInvokePlugin[]{new InlineAll()}, null, null, null, null, null, graphCache, () -> null, false, false, true);
 
             decoder.decode(testMethod);

compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/CachingPEGraphDecoder.java

@@ -68,7 +68,7 @@ public class CachingPEGraphDecoder extends PEGraphDecoder {
 
     private static final TimerKey BuildGraphTimer = DebugContext.timer("PartialEvaluation-GraphBuilding");
 
-    protected final Providers providers;
+    protected final Providers graphCacheProviders;
     protected final GraphBuilderConfiguration graphBuilderConfig;
     protected final OptimisticOptimizations optimisticOpts;
     private final EconomicMap<ResolvedJavaMethod, EncodedGraph> persistentGraphCache;
@@ -84,21 +84,22 @@ public class CachingPEGraphDecoder extends PEGraphDecoder {
      * @param forceLink if {@code true} and the graph contains an invoke of a method from a class
      *            that has not yet been linked, linking is performed.
      */
-    public CachingPEGraphDecoder(Architecture architecture, StructuredGraph graph, Providers providers, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts,
+    public CachingPEGraphDecoder(Architecture architecture, StructuredGraph graph, Providers graphCacheProviders, Providers decodingProviders, GraphBuilderConfiguration graphBuilderConfig,
+                    OptimisticOptimizations optimisticOpts,
                     LoopExplosionPlugin loopExplosionPlugin, InvocationPlugins invocationPlugins, InlineInvokePlugin[] inlineInvokePlugins,
                     ParameterPlugin parameterPlugin,
                     NodePlugin[] nodePlugins, ResolvedJavaMethod peRootForInlining, SourceLanguagePositionProvider sourceLanguagePositionProvider,
                     BasePhase<? super CoreProviders> postParsingPhase, EconomicMap<ResolvedJavaMethod, EncodedGraph> persistentGraphCache, Supplier<AutoCloseable> createPersistentCachedGraphScope,
                     boolean allowAssumptionsDuringParsing,
                     boolean needsExplicitException,
                     boolean forceLink) {
-        super(architecture, graph, providers, loopExplosionPlugin,
+        super(architecture, graph, decodingProviders, loopExplosionPlugin,
                         invocationPlugins, inlineInvokePlugins, parameterPlugin, nodePlugins, peRootForInlining, sourceLanguagePositionProvider,
                         new ConcurrentHashMap<>(), new ConcurrentHashMap<>(), needsExplicitException, forceLink);
 
         assert !graphBuilderConfig.trackNodeSourcePosition() || graph.trackNodeSourcePosition();
 
-        this.providers = providers;
+        this.graphCacheProviders = graphCacheProviders;
         this.graphBuilderConfig = graphBuilderConfig;
         this.optimisticOpts = optimisticOpts;
         this.postParsingPhase = postParsingPhase;
@@ -128,9 +129,9 @@ private EncodedGraph createGraph(ResolvedJavaMethod method, BytecodeProvider int
          * initial graph.
          */
         try (DebugContext.Scope scope = debug.scope("createGraph", graphToEncode)) {
-            new ConvertDeoptimizeToGuardPhase(canonicalizer).apply(graphToEncode, providers);
+            new ConvertDeoptimizeToGuardPhase(canonicalizer).apply(graphToEncode, graphCacheProviders);
             if (GraalOptions.EarlyGVN.getValue(graphToEncode.getOptions())) {
-                new DominatorBasedGlobalValueNumberingPhase(canonicalizer).apply(graphToEncode, providers);
+                new DominatorBasedGlobalValueNumberingPhase(canonicalizer).apply(graphToEncode, graphCacheProviders);
             }
         } catch (Throwable t) {
             throw debug.handle(t);
@@ -164,9 +165,9 @@ private StructuredGraph buildGraph(ResolvedJavaMethod method, BytecodeProvider i
             IntrinsicContext initialIntrinsicContext = null;
             GraphBuilderPhase.Instance graphBuilderPhaseInstance = createGraphBuilderPhaseInstance(initialIntrinsicContext);
             graphBuilderPhaseInstance.apply(graphToEncode);
-            canonicalizer.apply(graphToEncode, providers);
+            canonicalizer.apply(graphToEncode, graphCacheProviders);
             if (postParsingPhase != null) {
-                postParsingPhase.apply(graphToEncode, providers);
+                postParsingPhase.apply(graphToEncode, graphCacheProviders);
             }
         } catch (Throwable ex) {
             throw debug.handle(ex);

compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/PartialEvaluator.java

@@ -122,6 +122,7 @@ public abstract class PartialEvaluator {
     protected boolean persistentEncodedGraphCache;
 
     protected final TruffleConstantFieldProvider constantFieldProvider;
+    private final TruffleCachingConstantFieldProvider graphCacheConstantFieldProvider;
 
     @SuppressWarnings("this-escape")
     public PartialEvaluator(TruffleCompilerConfiguration config, GraphBuilderConfiguration configForRoot) {
@@ -132,6 +133,7 @@ public PartialEvaluator(TruffleCompilerConfiguration config, GraphBuilderConfigu
         this.lastTierDecodingPlugins = createDecodingInvocationPlugins(config.lastTier().partialEvaluator(), configForRoot.getPlugins(), config.lastTier().providers());
         this.nodePlugins = createNodePlugins(configForRoot.getPlugins());
         this.constantFieldProvider = new TruffleConstantFieldProvider(this, getProviders().getConstantFieldProvider());
+        this.graphCacheConstantFieldProvider = new TruffleCachingConstantFieldProvider(this, getProviders().getConstantFieldProvider());
     }
 
     protected void initialize(OptionValues options) {
@@ -406,11 +408,11 @@ protected PEGraphDecoder createGraphDecoder(TruffleTierContext context, Invocati
         DeoptimizeOnExceptionPhase postParsingPhase = new DeoptimizeOnExceptionPhase(
                         method -> getMethodInfo(method).inlineForPartialEvaluation() == InlineKind.DO_NOT_INLINE_WITH_SPECULATIVE_EXCEPTION);
 
-        Providers baseProviders = config.lastTier().providers();
-        Providers compilationUnitProviders = config.lastTier().providers().copyWith(constantFieldProvider);
+        Providers graphCacheProviders = config.lastTier().providers().copyWith(graphCacheConstantFieldProvider);
+        Providers decoderProviders = config.lastTier().providers().copyWith(constantFieldProvider);
 
         assert !allowAssumptionsDuringParsing || !persistentEncodedGraphCache;
-        return new CachingPEGraphDecoder(config.architecture(), context.graph, compilationUnitProviders, newConfig, TruffleCompilerImpl.Optimizations,
+        return new CachingPEGraphDecoder(config.architecture(), context.graph, graphCacheProviders, decoderProviders, newConfig, TruffleCompilerImpl.Optimizations,
                         loopExplosionPlugin, decodingPlugins, inlineInvokePlugins, parameterPlugin, nodePluginList, types.OptimizedCallTarget_callInlined,
                         sourceLanguagePositionProvider, postParsingPhase, graphCache, createCachedGraphScope, allowAssumptionsDuringParsing, false, true);
     }

compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleCachingConstantFieldProvider.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.graalvm.compiler.truffle.compiler;
+
+import com.oracle.truffle.compiler.ConstantFieldInfo;
+
+import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
+import org.graalvm.compiler.replacements.CachingPEGraphDecoder;
+import jdk.vm.ci.meta.ResolvedJavaField;
+
+/**
+ * Constant field provider used for parsing into the graph cache on HotSpot in
+ * {@link CachingPEGraphDecoder}.
+ */
+final class TruffleCachingConstantFieldProvider implements ConstantFieldProvider {
+
+    private final PartialEvaluator partialEvaluator;
+    private final ConstantFieldProvider delegate;
+
+    TruffleCachingConstantFieldProvider(PartialEvaluator partialEvaluator, ConstantFieldProvider delegate) {
+        this.partialEvaluator = partialEvaluator;
+        this.delegate = delegate;
+    }
+
+    @Override
+    public <T> T readConstantField(ResolvedJavaField field, ConstantFieldTool<T> tool) {
+        boolean isStaticField = field.isStatic();
+        if (!isStaticField && tool.getReceiver().isNull()) {
+            return null;
+        }
+        ConstantFieldInfo info = partialEvaluator.getConstantFieldInfo(field);
+        if (info != null) {
+            /*
+             * Non-null info means the field is annotated by one of the
+             * annotations @CompilationFinal, @Child or @Children. We are not folding such fields
+             * for the code cache on HotSpot. Not even static final fields. We delay this to the
+             * partial evaluation phase to ensure we are not losing the annotation information and
+             * are not reading values that are not yet stable when creating the graph for the cache.
+             * For example, a static final array annotated by '@CompilationFinal(dimensions = 1)':
+             * We cannot fold the array with 'stableDimension=1', because for the cache, the first
+             * dimension is not stable. We cannot fold it with 'stableDimension=0' either, because
+             * we would lose the information about the first dimension being stable for the partial
+             * evaluation phase.
+             **/
+            return null;
+        } else {
+            // otherwise do regular constant folding.
+            return delegate.readConstantField(field, tool);
+        }
+    }
+
+    @Override
+    public boolean maybeFinal(ResolvedJavaField field) {
+        return delegate.maybeFinal(field);
+    }
+
+}

compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleConstantFieldProvider.java

@@ -32,6 +32,11 @@
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.ResolvedJavaField;
 
+/**
+ * Constant field provider used for Truffle partial evaluation.
+ *
+ * @see TruffleCachingConstantFieldProvider
+ */
 final class TruffleConstantFieldProvider implements ConstantFieldProvider {
 
     private final PartialEvaluator partialEvaluator;