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

*** 29,38 ****
--- 29,39 ----
  import jdk.internal.vm.compiler.collections.EconomicMap;
  import org.graalvm.compiler.bytecode.BytecodeProvider;
  import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.graph.SourceLanguagePositionProvider;
  import org.graalvm.compiler.java.GraphBuilderPhase;
+ import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase;
  import org.graalvm.compiler.nodes.EncodedGraph;
  import org.graalvm.compiler.nodes.GraphEncoder;
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
  import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
*** 42,52 ****
  import org.graalvm.compiler.nodes.graphbuilderconf.LoopExplosionPlugin;
  import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
  import org.graalvm.compiler.nodes.graphbuilderconf.ParameterPlugin;
  import org.graalvm.compiler.phases.OptimisticOptimizations;
  import org.graalvm.compiler.phases.common.CanonicalizerPhase;
- import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase;
  import org.graalvm.compiler.phases.tiers.PhaseContext;
  import org.graalvm.compiler.phases.util.Providers;
  
  import jdk.vm.ci.code.Architecture;
  import jdk.vm.ci.meta.ResolvedJavaMethod;
--- 43,52 ----
*** 65,87 ****
  
      public CachingPEGraphDecoder(Architecture architecture, StructuredGraph graph, Providers providers, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts,
                      AllowAssumptions allowAssumptions, LoopExplosionPlugin loopExplosionPlugin, InvocationPlugins invocationPlugins, InlineInvokePlugin[] inlineInvokePlugins,
                      ParameterPlugin parameterPlugin,
                      NodePlugin[] nodePlugins, ResolvedJavaMethod callInlinedMethod, SourceLanguagePositionProvider sourceLanguagePositionProvider) {
!         super(architecture, graph, providers.getMetaAccess(), providers.getConstantReflection(), providers.getConstantFieldProvider(), providers.getStampProvider(), loopExplosionPlugin,
                          invocationPlugins, inlineInvokePlugins, parameterPlugin, nodePlugins, callInlinedMethod, sourceLanguagePositionProvider);
  
          this.providers = providers;
          this.graphBuilderConfig = graphBuilderConfig;
          this.optimisticOpts = optimisticOpts;
          this.allowAssumptions = allowAssumptions;
          this.graphCache = EconomicMap.create();
      }
  
      protected GraphBuilderPhase.Instance createGraphBuilderPhaseInstance(IntrinsicContext initialIntrinsicContext) {
!         return new GraphBuilderPhase.Instance(providers.getMetaAccess(), providers.getStampProvider(), providers.getConstantReflection(), providers.getConstantFieldProvider(), graphBuilderConfig,
!                         optimisticOpts, initialIntrinsicContext);
      }
  
      @SuppressWarnings("try")
      private EncodedGraph createGraph(ResolvedJavaMethod method, ResolvedJavaMethod originalMethod, BytecodeProvider intrinsicBytecodeProvider, boolean isSubstitution) {
          // @formatter:off
--- 65,86 ----
  
      public CachingPEGraphDecoder(Architecture architecture, StructuredGraph graph, Providers providers, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts,
                      AllowAssumptions allowAssumptions, LoopExplosionPlugin loopExplosionPlugin, InvocationPlugins invocationPlugins, InlineInvokePlugin[] inlineInvokePlugins,
                      ParameterPlugin parameterPlugin,
                      NodePlugin[] nodePlugins, ResolvedJavaMethod callInlinedMethod, SourceLanguagePositionProvider sourceLanguagePositionProvider) {
!         super(architecture, graph, providers, loopExplosionPlugin,
                          invocationPlugins, inlineInvokePlugins, parameterPlugin, nodePlugins, callInlinedMethod, sourceLanguagePositionProvider);
  
          this.providers = providers;
          this.graphBuilderConfig = graphBuilderConfig;
          this.optimisticOpts = optimisticOpts;
          this.allowAssumptions = allowAssumptions;
          this.graphCache = EconomicMap.create();
      }
  
      protected GraphBuilderPhase.Instance createGraphBuilderPhaseInstance(IntrinsicContext initialIntrinsicContext) {
!         return new GraphBuilderPhase.Instance(providers, graphBuilderConfig, optimisticOpts, initialIntrinsicContext);
      }
  
      @SuppressWarnings("try")
      private EncodedGraph createGraph(ResolvedJavaMethod method, ResolvedJavaMethod originalMethod, BytecodeProvider intrinsicBytecodeProvider, boolean isSubstitution) {
          // @formatter:off