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

*** 22,31 ****
--- 22,32 ----
   */
  
  
  package org.graalvm.compiler.replacements;
  
+ import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
  import static org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING;
  
  import java.lang.reflect.Method;
  import java.lang.reflect.Modifier;
  import java.util.ArrayList;
*** 356,372 ****
  
          MetaAccessProvider metaAccess = providers.getMetaAccess();
          Plugins plugins = new Plugins(graphBuilderPlugins);
          GraphBuilderConfiguration config = GraphBuilderConfiguration.getSnippetDefault(plugins);
  
!         StructuredGraph 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);
  
--- 357,378 ----
  
          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);