Disallow encoded snippet cache replacements when replay is a possibility.

Author: pecimuth

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/replaycomp/test/ReplayCompilationTest.java

@@ -38,6 +38,8 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import com.oracle.truffle.api.Truffle;
@@ -46,6 +48,7 @@
 import jdk.graal.compiler.core.CompilationWrapper;
 import jdk.graal.compiler.core.GraalCompilerOptions;
 import jdk.graal.compiler.core.test.GraalCompilerTest;
+import jdk.graal.compiler.debug.DebugCloseable;
 import jdk.graal.compiler.debug.DebugOptions;
 import jdk.graal.compiler.debug.GlobalMetrics;
 import jdk.graal.compiler.debug.LogStream;
@@ -54,9 +57,11 @@
 import jdk.graal.compiler.hotspot.CompilerConfigurationFactory;
 import jdk.graal.compiler.hotspot.HotSpotGraalCompiler;
 import jdk.graal.compiler.hotspot.HotSpotGraalCompilerFactory;
+import jdk.graal.compiler.hotspot.HotSpotReplacementsImpl;
 import jdk.graal.compiler.hotspot.replaycomp.CompilerInterfaceDeclarations;
 import jdk.graal.compiler.hotspot.replaycomp.ReplayCompilationRunner;
 import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
 import jdk.graal.compiler.runtime.RuntimeProvider;
 import jdk.vm.ci.hotspot.HotSpotCompilationRequest;
 import jdk.vm.ci.hotspot.HotSpotCompilationRequestResult;
@@ -69,6 +74,25 @@
  * Tests for compilation recording and replay.
  */
 public class ReplayCompilationTest extends GraalCompilerTest {
+    /**
+     * A separate encoded snippet scope is necessary in case the global encoded snippets have cache
+     * replacements.
+     */
+    private static DebugCloseable snippetScope;
+
+    @BeforeClass
+    public static void setup() {
+        Providers providers = Graal.getRequiredCapability(RuntimeProvider.class).getHostBackend().getProviders();
+        HotSpotReplacementsImpl replacements = (HotSpotReplacementsImpl) providers.getReplacements();
+        snippetScope = replacements.suppressEncodedSnippets();
+        replacements.encode(getInitialOptions());
+    }
+
+    @AfterClass
+    public static void teardown() {
+        snippetScope.close();
+    }
+
     private static int[] lengthsSquared(List<String> strings) {
         return strings.stream().mapToInt(String::length).map(i -> i * i).toArray();
     }

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

@@ -47,6 +47,7 @@
 import jdk.graal.compiler.core.common.type.StampPair;
 import jdk.graal.compiler.core.common.type.SymbolicJVMCIReference;
 import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugOptions;
 import jdk.graal.compiler.debug.GraalError;
 import jdk.graal.compiler.nodeinfo.Verbosity;
 import jdk.graal.compiler.nodes.ConstantNode;
@@ -250,12 +251,14 @@ StructuredGraph getEncodedSnippet(ResolvedJavaMethod method, ResolvedJavaMethod
             declaringClass = replacements.getProviders().getMetaAccess().lookupJavaType(Object.class);
         }
         /*
-         * If this is a recorded/replayed compilation, we must not mutate the snippet objects. This
-         * ensures we record all relevant operations during recording and no proxies are stored in
-         * the snippet objects during replay.
+         * If there is a possibility of a recorded/replayed compilation, we must not mutate the
+         * snippet objects. During recording, this ensures that we record all relevant operations
+         * and the cached objects are resolved to proxies. During replay, this ensures that no
+         * proxies are stored in the snippet objects.
          */
         boolean allowCacheReplacements = replacements.getProviders().getReplayCompilationSupport() == null &&
-                        GraalCompilerOptions.CompilationFailureAction.getValue(options) != CompilationWrapper.ExceptionAction.Diagnose;
+                        GraalCompilerOptions.CompilationFailureAction.getValue(options) != CompilationWrapper.ExceptionAction.Diagnose &&
+                        !DebugOptions.RecordForReplay.hasBeenSet(options);
         SymbolicEncodedGraph encodedGraph = new SymbolicEncodedGraph(snippetEncoding, startOffset, snippetObjects, allowCacheReplacements,
                         snippetNodeClasses, data.originalMethod, declaringClass);
         return decodeSnippetGraph(encodedGraph, method, original, replacements, args, allowAssumptions, options, true);