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

*** 27,38 ****
  
  import java.util.EnumMap;
  
  import org.graalvm.compiler.api.replacements.Snippet;
  import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
  import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
- import org.graalvm.compiler.debug.Debug;
  import org.graalvm.compiler.nodes.ConstantNode;
  import org.graalvm.compiler.nodes.PiNode;
  import org.graalvm.compiler.nodes.ValueNode;
  import org.graalvm.compiler.nodes.calc.FloatingNode;
  import org.graalvm.compiler.nodes.extended.BoxNode;
--- 27,38 ----
  
  import java.util.EnumMap;
  
  import org.graalvm.compiler.api.replacements.Snippet;
  import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
+ import org.graalvm.compiler.debug.DebugHandlersFactory;
  import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
  import org.graalvm.compiler.nodes.ConstantNode;
  import org.graalvm.compiler.nodes.PiNode;
  import org.graalvm.compiler.nodes.ValueNode;
  import org.graalvm.compiler.nodes.calc.FloatingNode;
  import org.graalvm.compiler.nodes.extended.BoxNode;
*** 183,194 ****
          private final EnumMap<JavaKind, SnippetInfo> unboxSnippets = new EnumMap<>(JavaKind.class);
  
          private final SnippetCounter valueOfCounter;
          private final SnippetCounter valueCounter;
  
!         public Templates(OptionValues options, SnippetCounter.Group.Factory factory, Providers providers, SnippetReflectionProvider snippetReflection, TargetDescription target) {
!             super(options, providers, snippetReflection, target);
              for (JavaKind kind : new JavaKind[]{JavaKind.Boolean, JavaKind.Byte, JavaKind.Char, JavaKind.Double, JavaKind.Float, JavaKind.Int, JavaKind.Long, JavaKind.Short}) {
                  boxSnippets.put(kind, snippet(BoxingSnippets.class, kind.getJavaName() + "ValueOf"));
                  unboxSnippets.put(kind, snippet(BoxingSnippets.class, kind.getJavaName() + "Value"));
              }
              Group group = factory.createSnippetCounterGroup("Boxing");
--- 183,195 ----
          private final EnumMap<JavaKind, SnippetInfo> unboxSnippets = new EnumMap<>(JavaKind.class);
  
          private final SnippetCounter valueOfCounter;
          private final SnippetCounter valueCounter;
  
!         public Templates(OptionValues options, Iterable<DebugHandlersFactory> factories, SnippetCounter.Group.Factory factory, Providers providers, SnippetReflectionProvider snippetReflection,
!                         TargetDescription target) {
!             super(options, factories, providers, snippetReflection, target);
              for (JavaKind kind : new JavaKind[]{JavaKind.Boolean, JavaKind.Byte, JavaKind.Char, JavaKind.Double, JavaKind.Float, JavaKind.Int, JavaKind.Long, JavaKind.Short}) {
                  boxSnippets.put(kind, snippet(BoxingSnippets.class, kind.getJavaName() + "ValueOf"));
                  unboxSnippets.put(kind, snippet(BoxingSnippets.class, kind.getJavaName() + "Value"));
              }
              Group group = factory.createSnippetCounterGroup("Boxing");
*** 204,225 ****
              } else {
                  Arguments args = new Arguments(boxSnippets.get(box.getBoxingKind()), box.graph().getGuardsStage(), tool.getLoweringStage());
                  args.add("value", box.getValue());
                  args.addConst("valueOfCounter", valueOfCounter);
  
!                 SnippetTemplate template = template(args);
!                 Debug.log("Lowering integerValueOf in %s: node=%s, template=%s, arguments=%s", box.graph(), box, template, args);
                  template.instantiate(providers.getMetaAccess(), box, DEFAULT_REPLACER, args);
              }
          }
  
          public void lower(UnboxNode unbox, LoweringTool tool) {
              Arguments args = new Arguments(unboxSnippets.get(unbox.getBoxingKind()), unbox.graph().getGuardsStage(), tool.getLoweringStage());
              args.add("value", unbox.getValue());
              args.addConst("valueCounter", valueCounter);
  
!             SnippetTemplate template = template(args);
!             Debug.log("Lowering integerValueOf in %s: node=%s, template=%s, arguments=%s", unbox.graph(), unbox, template, args);
              template.instantiate(providers.getMetaAccess(), unbox, DEFAULT_REPLACER, args);
          }
      }
  }
--- 205,226 ----
              } else {
                  Arguments args = new Arguments(boxSnippets.get(box.getBoxingKind()), box.graph().getGuardsStage(), tool.getLoweringStage());
                  args.add("value", box.getValue());
                  args.addConst("valueOfCounter", valueOfCounter);
  
!                 SnippetTemplate template = template(box.getDebug(), args);
!                 box.getDebug().log("Lowering integerValueOf in %s: node=%s, template=%s, arguments=%s", box.graph(), box, template, args);
                  template.instantiate(providers.getMetaAccess(), box, DEFAULT_REPLACER, args);
              }
          }
  
          public void lower(UnboxNode unbox, LoweringTool tool) {
              Arguments args = new Arguments(unboxSnippets.get(unbox.getBoxingKind()), unbox.graph().getGuardsStage(), tool.getLoweringStage());
              args.add("value", unbox.getValue());
              args.addConst("valueCounter", valueCounter);
  
!             SnippetTemplate template = template(unbox.getDebug(), args);
!             unbox.getDebug().log("Lowering integerValueOf in %s: node=%s, template=%s, arguments=%s", unbox.graph(), unbox, template, args);
              template.instantiate(providers.getMetaAccess(), unbox, DEFAULT_REPLACER, args);
          }
      }
  }