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

*** 104,113 ****
--- 104,115 ----
  import org.graalvm.compiler.nodes.java.NewArrayNode;
  import org.graalvm.compiler.nodes.java.NewInstanceNode;
  import org.graalvm.compiler.nodes.java.NewMultiArrayNode;
  import org.graalvm.compiler.nodes.java.StoreFieldNode;
  import org.graalvm.compiler.nodes.java.StoreIndexedNode;
+ import org.graalvm.compiler.nodes.spi.CoreProviders;
+ 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.nodes.util.GraphUtil;
  import org.graalvm.compiler.options.Option;
  import org.graalvm.compiler.options.OptionKey;
*** 307,332 ****
              throw GraphUtil.createBailoutException(string, bailout, GraphUtil.approxSourceStackTraceElement(methodScope.getCallerBytecodePosition()));
          }
  
          @Override
          public StampProvider getStampProvider() {
!             return stampProvider;
          }
  
          @Override
          public MetaAccessProvider getMetaAccess() {
!             return metaAccess;
          }
  
          @Override
          public ConstantReflectionProvider getConstantReflection() {
!             return constantReflection;
          }
  
          @Override
          public ConstantFieldProvider getConstantFieldProvider() {
!             return constantFieldProvider;
          }
  
          @Override
          public StructuredGraph getGraph() {
              return graph;
--- 309,339 ----
              throw GraphUtil.createBailoutException(string, bailout, GraphUtil.approxSourceStackTraceElement(methodScope.getCallerBytecodePosition()));
          }
  
          @Override
          public StampProvider getStampProvider() {
!             return providers.getStampProvider();
          }
  
          @Override
          public MetaAccessProvider getMetaAccess() {
!             return providers.getMetaAccess();
          }
  
          @Override
          public ConstantReflectionProvider getConstantReflection() {
!             return providers.getConstantReflection();
          }
  
          @Override
          public ConstantFieldProvider getConstantFieldProvider() {
!             return providers.getConstantFieldProvider();
!         }
! 
!         @Override
!         public Replacements getReplacements() {
!             return providers.getReplacements();
          }
  
          @Override
          public StructuredGraph getGraph() {
              return graph;
*** 563,577 ****
      private final EconomicMap<SpecialCallTargetCacheKey, Object> specialCallTargetCache;
      private final EconomicMap<ResolvedJavaMethod, Object> invocationPluginCache;
      private final ResolvedJavaMethod callInlinedMethod;
      protected final SourceLanguagePositionProvider sourceLanguagePositionProvider;
  
!     public PEGraphDecoder(Architecture architecture, StructuredGraph graph, MetaAccessProvider metaAccess, ConstantReflectionProvider constantReflection, ConstantFieldProvider constantFieldProvider,
!                     StampProvider stampProvider, LoopExplosionPlugin loopExplosionPlugin, InvocationPlugins invocationPlugins, InlineInvokePlugin[] inlineInvokePlugins,
                      ParameterPlugin parameterPlugin,
                      NodePlugin[] nodePlugins, ResolvedJavaMethod callInlinedMethod, SourceLanguagePositionProvider sourceLanguagePositionProvider) {
!         super(architecture, graph, metaAccess, constantReflection, constantFieldProvider, stampProvider, true);
          this.loopExplosionPlugin = loopExplosionPlugin;
          this.invocationPlugins = invocationPlugins;
          this.inlineInvokePlugins = inlineInvokePlugins;
          this.parameterPlugin = parameterPlugin;
          this.nodePlugins = nodePlugins;
--- 570,584 ----
      private final EconomicMap<SpecialCallTargetCacheKey, Object> specialCallTargetCache;
      private final EconomicMap<ResolvedJavaMethod, Object> invocationPluginCache;
      private final ResolvedJavaMethod callInlinedMethod;
      protected final SourceLanguagePositionProvider sourceLanguagePositionProvider;
  
!     public PEGraphDecoder(Architecture architecture, StructuredGraph graph, CoreProviders providers, LoopExplosionPlugin loopExplosionPlugin, InvocationPlugins invocationPlugins,
!                     InlineInvokePlugin[] inlineInvokePlugins,
                      ParameterPlugin parameterPlugin,
                      NodePlugin[] nodePlugins, ResolvedJavaMethod callInlinedMethod, SourceLanguagePositionProvider sourceLanguagePositionProvider) {
!         super(architecture, graph, providers, true);
          this.loopExplosionPlugin = loopExplosionPlugin;
          this.invocationPlugins = invocationPlugins;
          this.inlineInvokePlugins = inlineInvokePlugins;
          this.parameterPlugin = parameterPlugin;
          this.nodePlugins = nodePlugins;