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

*** 29,38 ****
--- 29,39 ----
  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.spi.ForeignCallDescriptor;
+ import org.graalvm.compiler.debug.DebugHandlersFactory;
  import org.graalvm.compiler.debug.GraalError;
  import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
  import org.graalvm.compiler.graph.Node.NodeIntrinsic;
  import org.graalvm.compiler.hotspot.HotSpotBackend;
  import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
*** 112,123 ****
      public static class Templates extends AbstractTemplates {
          private final SnippetInfo profileMethodEntryWithProbability = snippet(ProbabilisticProfileSnippets.class, "profileMethodEntryWithProbability");
          private final SnippetInfo profileBackedgeWithProbability = snippet(ProbabilisticProfileSnippets.class, "profileBackedgeWithProbability");
          private final SnippetInfo profileConditionalBackedgeWithProbability = snippet(ProbabilisticProfileSnippets.class, "profileConditionalBackedgeWithProbability");
  
!         public Templates(OptionValues options, HotSpotProviders providers, TargetDescription target) {
!             super(options, providers, providers.getSnippetReflection(), target);
          }
  
          public void lower(ProfileNode profileNode, LoweringTool tool) {
              assert profileNode.getRandom() != null;
  
--- 113,124 ----
      public static class Templates extends AbstractTemplates {
          private final SnippetInfo profileMethodEntryWithProbability = snippet(ProbabilisticProfileSnippets.class, "profileMethodEntryWithProbability");
          private final SnippetInfo profileBackedgeWithProbability = snippet(ProbabilisticProfileSnippets.class, "profileBackedgeWithProbability");
          private final SnippetInfo profileConditionalBackedgeWithProbability = snippet(ProbabilisticProfileSnippets.class, "profileConditionalBackedgeWithProbability");
  
!         public Templates(OptionValues options, Iterable<DebugHandlersFactory> factories, HotSpotProviders providers, TargetDescription target) {
!             super(options, factories, providers, providers.getSnippetReflection(), target);
          }
  
          public void lower(ProfileNode profileNode, LoweringTool tool) {
              assert profileNode.getRandom() != null;
  
*** 139,159 ****
                      args.add("branchCondition", profileBranchNode.branchCondition());
                  }
                  args.add("bci", bci);
                  args.add("targetBci", targetBci);
  
!                 SnippetTemplate template = template(args);
                  template.instantiate(providers.getMetaAccess(), profileNode, DEFAULT_REPLACER, args);
              } else if (profileNode instanceof ProfileInvokeNode) {
                  ProfileInvokeNode profileInvokeNode = (ProfileInvokeNode) profileNode;
                  // Method invocation event
                  Arguments args = new Arguments(profileMethodEntryWithProbability, graph.getGuardsStage(), tool.getLoweringStage());
                  args.add("counters", counters);
                  args.add("random", profileInvokeNode.getRandom());
                  args.addConst("freqLog", profileInvokeNode.getNotificationFreqLog());
                  args.addConst("probLog", profileInvokeNode.getProbabilityLog());
!                 SnippetTemplate template = template(args);
                  template.instantiate(providers.getMetaAccess(), profileNode, DEFAULT_REPLACER, args);
              } else {
                  throw new GraalError("Unsupported profile node type: " + profileNode);
              }
  
--- 140,160 ----
                      args.add("branchCondition", profileBranchNode.branchCondition());
                  }
                  args.add("bci", bci);
                  args.add("targetBci", targetBci);
  
!                 SnippetTemplate template = template(graph.getDebug(), args);
                  template.instantiate(providers.getMetaAccess(), profileNode, DEFAULT_REPLACER, args);
              } else if (profileNode instanceof ProfileInvokeNode) {
                  ProfileInvokeNode profileInvokeNode = (ProfileInvokeNode) profileNode;
                  // Method invocation event
                  Arguments args = new Arguments(profileMethodEntryWithProbability, graph.getGuardsStage(), tool.getLoweringStage());
                  args.add("counters", counters);
                  args.add("random", profileInvokeNode.getRandom());
                  args.addConst("freqLog", profileInvokeNode.getNotificationFreqLog());
                  args.addConst("probLog", profileInvokeNode.getProbabilityLog());
!                 SnippetTemplate template = template(graph.getDebug(), args);
                  template.instantiate(providers.getMetaAccess(), profileNode, DEFAULT_REPLACER, args);
              } else {
                  throw new GraalError("Unsupported profile node type: " + profileNode);
              }