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

*** 72,82 ****
  import org.graalvm.compiler.api.replacements.Snippet;
  import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
  import org.graalvm.compiler.api.replacements.Snippet.VarargsParameter;
  import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
  import org.graalvm.compiler.core.common.type.StampFactory;
! import org.graalvm.compiler.debug.Debug;
  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.GraalHotSpotVMConfig;
  import org.graalvm.compiler.hotspot.HotSpotBackend;
--- 72,82 ----
  import org.graalvm.compiler.api.replacements.Snippet;
  import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
  import org.graalvm.compiler.api.replacements.Snippet.VarargsParameter;
  import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
  import org.graalvm.compiler.core.common.type.StampFactory;
! 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.GraalHotSpotVMConfig;
  import org.graalvm.compiler.hotspot.HotSpotBackend;
*** 589,600 ****
          private final SnippetInfo newmultiarrayPIC = snippet(NewObjectSnippets.class, "newmultiarrayPIC", TLAB_TOP_LOCATION, TLAB_END_LOCATION);
          private final SnippetInfo verifyHeap = snippet(NewObjectSnippets.class, "verifyHeap");
          private final GraalHotSpotVMConfig config;
          private final Counters counters;
  
!         public Templates(OptionValues options, SnippetCounter.Group.Factory factory, HotSpotProviders providers, TargetDescription target, GraalHotSpotVMConfig config) {
!             super(options, providers, providers.getSnippetReflection(), target);
              this.config = config;
              counters = new Counters(factory);
          }
  
          /**
--- 589,601 ----
          private final SnippetInfo newmultiarrayPIC = snippet(NewObjectSnippets.class, "newmultiarrayPIC", TLAB_TOP_LOCATION, TLAB_END_LOCATION);
          private final SnippetInfo verifyHeap = snippet(NewObjectSnippets.class, "verifyHeap");
          private final GraalHotSpotVMConfig config;
          private final Counters counters;
  
!         public Templates(OptionValues options, Iterable<DebugHandlersFactory> factories, SnippetCounter.Group.Factory factory, HotSpotProviders providers, TargetDescription target,
!                         GraalHotSpotVMConfig config) {
!             super(options, factories, providers, providers.getSnippetReflection(), target);
              this.config = config;
              counters = new Counters(factory);
          }
  
          /**
*** 618,629 ****
              args.addConst("constantSize", true);
              args.addConst("typeContext", ProfileAllocations.getValue(localOptions) ? type.toJavaName(false) : "");
              args.addConst("options", localOptions);
              args.addConst("counters", counters);
  
!             SnippetTemplate template = template(args);
!             Debug.log("Lowering allocateInstance in %s: node=%s, template=%s, arguments=%s", graph, newInstanceNode, template, args);
              template.instantiate(providers.getMetaAccess(), newInstanceNode, DEFAULT_REPLACER, args);
          }
  
          /**
           * Lowers a {@link NewArrayNode}.
--- 619,630 ----
              args.addConst("constantSize", true);
              args.addConst("typeContext", ProfileAllocations.getValue(localOptions) ? type.toJavaName(false) : "");
              args.addConst("options", localOptions);
              args.addConst("counters", counters);
  
!             SnippetTemplate template = template(graph.getDebug(), args);
!             graph.getDebug().log("Lowering allocateInstance in %s: node=%s, template=%s, arguments=%s", graph, newInstanceNode, template, args);
              template.instantiate(providers.getMetaAccess(), newInstanceNode, DEFAULT_REPLACER, args);
          }
  
          /**
           * Lowers a {@link NewArrayNode}.
*** 661,672 ****
              args.addConst("threadRegister", registers.getThreadRegister());
              args.addConst("maybeUnroll", length.isConstant());
              args.addConst("typeContext", ProfileAllocations.getValue(localOptions) ? arrayType.toJavaName(false) : "");
              args.addConst("options", localOptions);
              args.addConst("counters", counters);
!             SnippetTemplate template = template(args);
!             Debug.log("Lowering allocateArray in %s: node=%s, template=%s, arguments=%s", graph, newArrayNode, template, args);
              template.instantiate(providers.getMetaAccess(), newArrayNode, DEFAULT_REPLACER, args);
          }
  
          public void lower(DynamicNewInstanceNode newInstanceNode, HotSpotRegistersProvider registers, LoweringTool tool) {
              Arguments args = new Arguments(allocateInstanceDynamic, newInstanceNode.graph().getGuardsStage(), tool.getLoweringStage());
--- 662,673 ----
              args.addConst("threadRegister", registers.getThreadRegister());
              args.addConst("maybeUnroll", length.isConstant());
              args.addConst("typeContext", ProfileAllocations.getValue(localOptions) ? arrayType.toJavaName(false) : "");
              args.addConst("options", localOptions);
              args.addConst("counters", counters);
!             SnippetTemplate template = template(graph.getDebug(), args);
!             graph.getDebug().log("Lowering allocateArray in %s: node=%s, template=%s, arguments=%s", graph, newArrayNode, template, args);
              template.instantiate(providers.getMetaAccess(), newArrayNode, DEFAULT_REPLACER, args);
          }
  
          public void lower(DynamicNewInstanceNode newInstanceNode, HotSpotRegistersProvider registers, LoweringTool tool) {
              Arguments args = new Arguments(allocateInstanceDynamic, newInstanceNode.graph().getGuardsStage(), tool.getLoweringStage());
*** 678,688 ****
              args.addConst("fillContents", newInstanceNode.fillContents());
              args.addConst("threadRegister", registers.getThreadRegister());
              args.addConst("options", localOptions);
              args.addConst("counters", counters);
  
!             SnippetTemplate template = template(args);
              template.instantiate(providers.getMetaAccess(), newInstanceNode, DEFAULT_REPLACER, args);
          }
  
          public void lower(DynamicNewArrayNode newArrayNode, HotSpotRegistersProvider registers, LoweringTool tool) {
              StructuredGraph graph = newArrayNode.graph();
--- 679,689 ----
              args.addConst("fillContents", newInstanceNode.fillContents());
              args.addConst("threadRegister", registers.getThreadRegister());
              args.addConst("options", localOptions);
              args.addConst("counters", counters);
  
!             SnippetTemplate template = template(newInstanceNode.getDebug(), args);
              template.instantiate(providers.getMetaAccess(), newInstanceNode, DEFAULT_REPLACER, args);
          }
  
          public void lower(DynamicNewArrayNode newArrayNode, HotSpotRegistersProvider registers, LoweringTool tool) {
              StructuredGraph graph = newArrayNode.graph();
*** 707,717 ****
                  args.addConst("knownLayoutHelper", 0);
              }
              args.add("prototypeMarkWord", lookupArrayClass(tool, JavaKind.Object).prototypeMarkWord());
              args.addConst("options", localOptions);
              args.addConst("counters", counters);
!             SnippetTemplate template = template(args);
              template.instantiate(providers.getMetaAccess(), newArrayNode, DEFAULT_REPLACER, args);
          }
  
          private static HotSpotResolvedObjectType lookupArrayClass(LoweringTool tool, JavaKind kind) {
              return (HotSpotResolvedObjectType) tool.getMetaAccess().lookupJavaType(kind == JavaKind.Object ? Object.class : kind.toJavaClass()).getArrayClass();
--- 708,718 ----
                  args.addConst("knownLayoutHelper", 0);
              }
              args.add("prototypeMarkWord", lookupArrayClass(tool, JavaKind.Object).prototypeMarkWord());
              args.addConst("options", localOptions);
              args.addConst("counters", counters);
!             SnippetTemplate template = template(graph.getDebug(), args);
              template.instantiate(providers.getMetaAccess(), newArrayNode, DEFAULT_REPLACER, args);
          }
  
          private static HotSpotResolvedObjectType lookupArrayClass(LoweringTool tool, JavaKind kind) {
              return (HotSpotResolvedObjectType) tool.getMetaAccess().lookupJavaType(kind == JavaKind.Object ? Object.class : kind.toJavaClass()).getArrayClass();
*** 731,741 ****
              SnippetInfo snippet = GeneratePIC.getValue(localOptions) ? newmultiarrayPIC : newmultiarray;
              Arguments args = new Arguments(snippet, graph.getGuardsStage(), tool.getLoweringStage());
              args.add("hub", hub);
              args.addConst("rank", rank);
              args.addVarargs("dimensions", int.class, StampFactory.forKind(JavaKind.Int), dims);
!             template(args).instantiate(providers.getMetaAccess(), newmultiarrayNode, DEFAULT_REPLACER, args);
          }
  
          private static int instanceSize(HotSpotResolvedObjectType type) {
              int size = type.instanceSize();
              assert size >= 0;
--- 732,742 ----
              SnippetInfo snippet = GeneratePIC.getValue(localOptions) ? newmultiarrayPIC : newmultiarray;
              Arguments args = new Arguments(snippet, graph.getGuardsStage(), tool.getLoweringStage());
              args.add("hub", hub);
              args.addConst("rank", rank);
              args.addVarargs("dimensions", int.class, StampFactory.forKind(JavaKind.Int), dims);
!             template(newmultiarrayNode.getDebug(), args).instantiate(providers.getMetaAccess(), newmultiarrayNode, DEFAULT_REPLACER, args);
          }
  
          private static int instanceSize(HotSpotResolvedObjectType type) {
              int size = type.instanceSize();
              assert size >= 0;
*** 745,755 ****
          public void lower(VerifyHeapNode verifyHeapNode, HotSpotRegistersProvider registers, LoweringTool tool) {
              if (config.cAssertions) {
                  Arguments args = new Arguments(verifyHeap, verifyHeapNode.graph().getGuardsStage(), tool.getLoweringStage());
                  args.addConst("threadRegister", registers.getThreadRegister());
  
!                 SnippetTemplate template = template(args);
                  template.instantiate(providers.getMetaAccess(), verifyHeapNode, DEFAULT_REPLACER, args);
              } else {
                  GraphUtil.removeFixedWithUnusedInputs(verifyHeapNode);
              }
          }
--- 746,756 ----
          public void lower(VerifyHeapNode verifyHeapNode, HotSpotRegistersProvider registers, LoweringTool tool) {
              if (config.cAssertions) {
                  Arguments args = new Arguments(verifyHeap, verifyHeapNode.graph().getGuardsStage(), tool.getLoweringStage());
                  args.addConst("threadRegister", registers.getThreadRegister());
  
!                 SnippetTemplate template = template(verifyHeapNode.getDebug(), args);
                  template.instantiate(providers.getMetaAccess(), verifyHeapNode, DEFAULT_REPLACER, args);
              } else {
                  GraphUtil.removeFixedWithUnusedInputs(verifyHeapNode);
              }
          }