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

*** 34,43 ****
--- 34,44 ----
  import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER;
  
  import org.graalvm.compiler.api.replacements.Snippet;
  import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
  import org.graalvm.compiler.core.common.type.Stamp;
+ import org.graalvm.compiler.debug.DebugHandlersFactory;
  import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
  import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider;
  import org.graalvm.compiler.hotspot.word.HotSpotWordTypes;
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.nodes.extended.ForeignCallNode;
*** 80,91 ****
      public static class Templates extends AbstractTemplates {
  
          private final SnippetInfo loadException = snippet(LoadExceptionObjectSnippets.class, "loadException", EXCEPTION_OOP_LOCATION, EXCEPTION_PC_LOCATION);
          private final HotSpotWordTypes wordTypes;
  
!         public Templates(OptionValues options, HotSpotProviders providers, TargetDescription target) {
!             super(options, providers, providers.getSnippetReflection(), target);
              this.wordTypes = providers.getWordTypes();
          }
  
          public void lower(LoadExceptionObjectNode loadExceptionObject, HotSpotRegistersProvider registers, LoweringTool tool) {
              StructuredGraph graph = loadExceptionObject.graph();
--- 81,92 ----
      public static class Templates extends AbstractTemplates {
  
          private final SnippetInfo loadException = snippet(LoadExceptionObjectSnippets.class, "loadException", EXCEPTION_OOP_LOCATION, EXCEPTION_PC_LOCATION);
          private final HotSpotWordTypes wordTypes;
  
!         public Templates(OptionValues options, Iterable<DebugHandlersFactory> factories, HotSpotProviders providers, TargetDescription target) {
!             super(options, factories, providers, providers.getSnippetReflection(), target);
              this.wordTypes = providers.getWordTypes();
          }
  
          public void lower(LoadExceptionObjectNode loadExceptionObject, HotSpotRegistersProvider registers, LoweringTool tool) {
              StructuredGraph graph = loadExceptionObject.graph();
*** 98,107 ****
                  loadExceptionC.setStateAfter(loadExceptionObject.stateAfter());
                  graph.replaceFixedWithFixed(loadExceptionObject, loadExceptionC);
              } else {
                  Arguments args = new Arguments(loadException, loadExceptionObject.graph().getGuardsStage(), tool.getLoweringStage());
                  args.addConst("threadRegister", registers.getThreadRegister());
!                 template(args).instantiate(providers.getMetaAccess(), loadExceptionObject, DEFAULT_REPLACER, args);
              }
          }
      }
  }
--- 99,108 ----
                  loadExceptionC.setStateAfter(loadExceptionObject.stateAfter());
                  graph.replaceFixedWithFixed(loadExceptionObject, loadExceptionC);
              } else {
                  Arguments args = new Arguments(loadException, loadExceptionObject.graph().getGuardsStage(), tool.getLoweringStage());
                  args.addConst("threadRegister", registers.getThreadRegister());
!                 template(loadExceptionObject.getDebug(), args).instantiate(providers.getMetaAccess(), loadExceptionObject, DEFAULT_REPLACER, args);
              }
          }
      }
  }