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

*** 66,75 ****
--- 66,76 ----
  import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
  import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderTool;
  import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
  import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
  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.nodes.type.StampTool;
  import org.graalvm.compiler.phases.OptimisticOptimizations;
  import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
  import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase.Optionality;
*** 150,159 ****
--- 151,165 ----
      public MetaAccessProvider getMetaAccess() {
          return providers.getMetaAccess();
      }
  
      @Override
+     public Replacements getReplacements() {
+         return providers.getReplacements();
+     }
+ 
+     @Override
      public StampProvider getStampProvider() {
          return providers.getStampProvider();
      }
  
      @Override
*** 353,389 ****
       * same manner as for snippets and method substitutions.
       */
      public void inline(InvokeNode invoke, String reason, String phase) {
          ResolvedJavaMethod method = ((MethodCallTargetNode) invoke.callTarget()).targetMethod();
  
-         MetaAccessProvider metaAccess = providers.getMetaAccess();
          Plugins plugins = new Plugins(graphBuilderPlugins);
          GraphBuilderConfiguration config = GraphBuilderConfiguration.getSnippetDefault(plugins);
  
          StructuredGraph calleeGraph;
          if (IS_IN_NATIVE_IMAGE) {
              calleeGraph = providers.getReplacements().getSnippet(method, null, false, null);
          } else {
              calleeGraph = new StructuredGraph.Builder(invoke.getOptions(), invoke.getDebug()).method(method).trackNodeSourcePosition(invoke.graph().trackNodeSourcePosition()).setIsSubstitution(
                              true).build();
              IntrinsicContext initialReplacementContext = new IntrinsicContext(method, method, providers.getReplacements().getDefaultReplacementBytecodeProvider(), INLINE_AFTER_PARSING);
!             GraphBuilderPhase.Instance instance = createGraphBuilderInstance(metaAccess, providers.getStampProvider(), providers.getConstantReflection(), providers.getConstantFieldProvider(), config,
!                             OptimisticOptimizations.NONE,
!                             initialReplacementContext);
              instance.apply(calleeGraph);
          }
  
          // Remove all frame states from inlinee
          calleeGraph.clearAllStateAfter();
          new DeadCodeEliminationPhase(Optionality.Required).apply(calleeGraph);
  
          InliningUtil.inline(invoke, calleeGraph, false, method, reason, phase);
      }
  
!     protected GraphBuilderPhase.Instance createGraphBuilderInstance(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);
      }
  
      protected void pushStructure(Structure structure) {
          structures.add(structure);
      }
--- 359,392 ----
       * same manner as for snippets and method substitutions.
       */
      public void inline(InvokeNode invoke, String reason, String phase) {
          ResolvedJavaMethod method = ((MethodCallTargetNode) invoke.callTarget()).targetMethod();
  
          Plugins plugins = new Plugins(graphBuilderPlugins);
          GraphBuilderConfiguration config = GraphBuilderConfiguration.getSnippetDefault(plugins);
  
          StructuredGraph calleeGraph;
          if (IS_IN_NATIVE_IMAGE) {
              calleeGraph = providers.getReplacements().getSnippet(method, null, false, null);
          } else {
              calleeGraph = new StructuredGraph.Builder(invoke.getOptions(), invoke.getDebug()).method(method).trackNodeSourcePosition(invoke.graph().trackNodeSourcePosition()).setIsSubstitution(
                              true).build();
              IntrinsicContext initialReplacementContext = new IntrinsicContext(method, method, providers.getReplacements().getDefaultReplacementBytecodeProvider(), INLINE_AFTER_PARSING);
!             GraphBuilderPhase.Instance instance = createGraphBuilderInstance(providers, config, OptimisticOptimizations.NONE, initialReplacementContext);
              instance.apply(calleeGraph);
          }
  
          // Remove all frame states from inlinee
          calleeGraph.clearAllStateAfter();
          new DeadCodeEliminationPhase(Optionality.Required).apply(calleeGraph);
  
          InliningUtil.inline(invoke, calleeGraph, false, method, reason, phase);
      }
  
!     protected GraphBuilderPhase.Instance createGraphBuilderInstance(Providers theProviders, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts,
!                     IntrinsicContext initialIntrinsicContext) {
!         return new GraphBuilderPhase.Instance(theProviders, graphBuilderConfig, optimisticOpts, initialIntrinsicContext);
      }
  
      protected void pushStructure(Structure structure) {
          structures.add(structure);
      }