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

*** 50,60 ****
  import org.graalvm.compiler.bytecode.Bytecode;
  import org.graalvm.compiler.bytecode.BytecodeProvider;
  import org.graalvm.compiler.bytecode.ResolvedJavaMethodBytecode;
  import org.graalvm.compiler.core.common.CompilationIdentifier;
  import org.graalvm.compiler.core.common.GraalOptions;
- import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
  import org.graalvm.compiler.debug.DebugCloseable;
  import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.debug.DebugContext.Description;
  import org.graalvm.compiler.debug.DebugHandlersFactory;
  import org.graalvm.compiler.debug.GraalError;
--- 50,59 ----
*** 62,71 ****
--- 61,71 ----
  import org.graalvm.compiler.graph.Node;
  import org.graalvm.compiler.graph.Node.NodeIntrinsic;
  import org.graalvm.compiler.graph.NodeSourcePosition;
  import org.graalvm.compiler.java.GraphBuilderPhase;
  import org.graalvm.compiler.java.GraphBuilderPhase.Instance;
+ import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase;
  import org.graalvm.compiler.nodes.CallTargetNode;
  import org.graalvm.compiler.nodes.Invoke;
  import org.graalvm.compiler.nodes.StateSplit;
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.nodes.ValueNode;
*** 78,103 ****
  import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
  import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
  import org.graalvm.compiler.nodes.graphbuilderconf.MethodSubstitutionPlugin;
  import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
  import org.graalvm.compiler.nodes.spi.Replacements;
- import org.graalvm.compiler.nodes.spi.StampProvider;
  import org.graalvm.compiler.options.Option;
  import org.graalvm.compiler.options.OptionKey;
  import org.graalvm.compiler.options.OptionType;
  import org.graalvm.compiler.options.OptionValues;
  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.common.DeadCodeEliminationPhase;
  import org.graalvm.compiler.phases.tiers.PhaseContext;
  import org.graalvm.compiler.phases.util.Providers;
  import org.graalvm.compiler.word.Word;
  import org.graalvm.compiler.word.WordOperationPlugin;
  
  import jdk.vm.ci.code.TargetDescription;
- import jdk.vm.ci.meta.ConstantReflectionProvider;
  import jdk.vm.ci.meta.MetaAccessProvider;
  import jdk.vm.ci.meta.ResolvedJavaMethod;
  import jdk.vm.ci.meta.ResolvedJavaType;
  
  public class ReplacementsImpl implements Replacements, InlineInvokePlugin {
--- 78,100 ----
*** 320,334 ****
                  }
                  assert graph.isFrozen();
                  result = graph;
              } else {
                  Bytecode code = new ResolvedJavaMethodBytecode(method);
-                 ConstantReflectionProvider constantReflection = providers.getConstantReflection();
-                 ConstantFieldProvider constantFieldProvider = providers.getConstantFieldProvider();
-                 StampProvider stampProvider = providers.getStampProvider();
                  try (DebugContext debug = openDebugContext("Substitution_", method)) {
!                     result = new IntrinsicGraphBuilder(options, debug, metaAccess, constantReflection, constantFieldProvider, stampProvider, code, invokeBci).buildGraph(plugin);
                  }
              }
          } else {
              result = null;
          }
--- 317,328 ----
                  }
                  assert graph.isFrozen();
                  result = graph;
              } else {
                  Bytecode code = new ResolvedJavaMethodBytecode(method);
                  try (DebugContext debug = openDebugContext("Substitution_", method)) {
!                     result = new IntrinsicGraphBuilder(options, debug, providers, code, invokeBci).buildGraph(plugin);
                  }
              }
          } else {
              result = null;
          }
*** 353,364 ****
              // @formatter:on
              try (DebugContext.Scope scope = debug.scope("GetIntrinsicGraph", graph)) {
                  Plugins plugins = new Plugins(getGraphBuilderPlugins());
                  GraphBuilderConfiguration config = GraphBuilderConfiguration.getSnippetDefault(plugins);
                  IntrinsicContext initialReplacementContext = new IntrinsicContext(method, substMethod, bytecodeProvider, ROOT_COMPILATION);
!                 new GraphBuilderPhase.Instance(providers.getMetaAccess(), providers.getStampProvider(), providers.getConstantReflection(), providers.getConstantFieldProvider(), config,
!                                 OptimisticOptimizations.NONE, initialReplacementContext).apply(graph);
                  assert !graph.isFrozen();
                  return graph;
              } catch (Throwable e) {
                  debug.handle(e);
              }
--- 347,357 ----
              // @formatter:on
              try (DebugContext.Scope scope = debug.scope("GetIntrinsicGraph", graph)) {
                  Plugins plugins = new Plugins(getGraphBuilderPlugins());
                  GraphBuilderConfiguration config = GraphBuilderConfiguration.getSnippetDefault(plugins);
                  IntrinsicContext initialReplacementContext = new IntrinsicContext(method, substMethod, bytecodeProvider, ROOT_COMPILATION);
!                 new GraphBuilderPhase.Instance(providers, config, OptimisticOptimizations.NONE, initialReplacementContext).apply(graph);
                  assert !graph.isFrozen();
                  return graph;
              } catch (Throwable e) {
                  debug.handle(e);
              }
*** 519,542 ****
                      ResolvedJavaMethod original = substitutedMethod != null ? substitutedMethod : method;
                      initialIntrinsicContext = new IntrinsicContext(original, method, bytecodeProvider, INLINE_AFTER_PARSING,
                                      snippetAnnotation != null ? snippetAnnotation.allowPartialIntrinsicArgumentMismatch() : true);
                  }
  
!                 createGraphBuilder(metaAccess, replacements.providers.getStampProvider(), replacements.providers.getConstantReflection(), replacements.providers.getConstantFieldProvider(), config,
!                                 OptimisticOptimizations.NONE, initialIntrinsicContext).apply(graph);
  
                  new CanonicalizerPhase().apply(graph, new PhaseContext(replacements.providers));
              } catch (Throwable e) {
                  throw debug.handle(e);
              }
              return graph;
          }
  
!         protected Instance createGraphBuilder(MetaAccessProvider metaAccess, StampProvider stampProvider, ConstantReflectionProvider constantReflection, ConstantFieldProvider constantFieldProvider,
!                         GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts, IntrinsicContext initialIntrinsicContext) {
!             return new GraphBuilderPhase.Instance(metaAccess, stampProvider, constantReflection, constantFieldProvider, graphBuilderConfig, optimisticOpts,
!                             initialIntrinsicContext);
          }
      }
  
      @Override
      public void registerSnippetTemplateCache(SnippetTemplateCache templates) {
--- 512,532 ----
                      ResolvedJavaMethod original = substitutedMethod != null ? substitutedMethod : method;
                      initialIntrinsicContext = new IntrinsicContext(original, method, bytecodeProvider, INLINE_AFTER_PARSING,
                                      snippetAnnotation != null ? snippetAnnotation.allowPartialIntrinsicArgumentMismatch() : true);
                  }
  
!                 createGraphBuilder(replacements.providers, config, OptimisticOptimizations.NONE, initialIntrinsicContext).apply(graph);
  
                  new CanonicalizerPhase().apply(graph, new PhaseContext(replacements.providers));
              } catch (Throwable e) {
                  throw debug.handle(e);
              }
              return graph;
          }
  
!         protected Instance createGraphBuilder(Providers providers, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts, IntrinsicContext initialIntrinsicContext) {
!             return new GraphBuilderPhase.Instance(providers, graphBuilderConfig, optimisticOpts, initialIntrinsicContext);
          }
      }
  
      @Override
      public void registerSnippetTemplateCache(SnippetTemplateCache templates) {