*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/WriteBarrierSnippets.java	Fri Jul  7 09:30:26 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/WriteBarrierSnippets.java	Fri Jul  7 09:30:26 2017

*** 47,56 ****
--- 47,57 ----
  import org.graalvm.compiler.api.replacements.Snippet;
  import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
  import org.graalvm.compiler.core.common.CompressEncoding;
  import org.graalvm.compiler.core.common.GraalOptions;
  import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
+ import org.graalvm.compiler.debug.DebugHandlersFactory;
  import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
  import org.graalvm.compiler.graph.Node.NodeIntrinsic;
  import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
  import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider;
  import org.graalvm.compiler.hotspot.nodes.G1ArrayRangePostWriteBarrier;

*** 404,415 ****
--- 405,417 ----
          private final SnippetInfo g1ArrayRangePostWriteBarrier = snippet(WriteBarrierSnippets.class, "g1ArrayRangePostWriteBarrier", GC_CARD_LOCATION, GC_INDEX_LOCATION, GC_LOG_LOCATION);
  
          private final CompressEncoding oopEncoding;
          private final Counters counters;
  
!         public Templates(OptionValues options, SnippetCounter.Group.Factory factory, HotSpotProviders providers, TargetDescription target, CompressEncoding oopEncoding) {
              super(options, providers, providers.getSnippetReflection(), target);
!         public Templates(OptionValues options, Iterable<DebugHandlersFactory> factories, SnippetCounter.Group.Factory factory, HotSpotProviders providers, TargetDescription target,
+                         CompressEncoding oopEncoding) {
+             super(options, factories, providers, providers.getSnippetReflection(), target);
              this.oopEncoding = oopEncoding;
              this.counters = new Counters(factory);
          }
  
          public void lower(SerialWriteBarrier writeBarrier, LoweringTool tool) {

*** 421,439 ****
--- 423,441 ----
                  args = new Arguments(serialImpreciseWriteBarrier, writeBarrier.graph().getGuardsStage(), tool.getLoweringStage());
                  OffsetAddressNode address = (OffsetAddressNode) writeBarrier.getAddress();
                  args.add("object", address.getBase());
              }
              args.addConst("counters", counters);
!             template(writeBarrier.getDebug(), args).instantiate(providers.getMetaAccess(), writeBarrier, DEFAULT_REPLACER, args);
          }
  
          public void lower(SerialArrayRangeWriteBarrier arrayRangeWriteBarrier, LoweringTool tool) {
              Arguments args = new Arguments(serialArrayRangeWriteBarrier, arrayRangeWriteBarrier.graph().getGuardsStage(), tool.getLoweringStage());
              args.add("object", arrayRangeWriteBarrier.getObject());
              args.add("startIndex", arrayRangeWriteBarrier.getStartIndex());
              args.add("length", arrayRangeWriteBarrier.getLength());
!             template(arrayRangeWriteBarrier.getDebug(), args).instantiate(providers.getMetaAccess(), arrayRangeWriteBarrier, DEFAULT_REPLACER, args);
          }
  
          public void lower(G1PreWriteBarrier writeBarrierPre, HotSpotRegistersProvider registers, LoweringTool tool) {
              Arguments args = new Arguments(g1PreWriteBarrier, writeBarrierPre.graph().getGuardsStage(), tool.getLoweringStage());
              AddressNode address = writeBarrierPre.getAddress();

*** 454,464 ****
--- 456,466 ----
              args.addConst("doLoad", writeBarrierPre.doLoad());
              args.addConst("nullCheck", writeBarrierPre.getNullCheck());
              args.addConst("threadRegister", registers.getThreadRegister());
              args.addConst("trace", traceBarrier(writeBarrierPre.graph()));
              args.addConst("counters", counters);
!             template(writeBarrierPre.getDebug(), args).instantiate(providers.getMetaAccess(), writeBarrierPre, DEFAULT_REPLACER, args);
          }
  
          public void lower(G1ReferentFieldReadBarrier readBarrier, HotSpotRegistersProvider registers, LoweringTool tool) {
              Arguments args = new Arguments(g1ReferentReadBarrier, readBarrier.graph().getGuardsStage(), tool.getLoweringStage());
              AddressNode address = readBarrier.getAddress();

*** 479,489 ****
--- 481,491 ----
              args.addConst("doLoad", readBarrier.doLoad());
              args.addConst("nullCheck", false);
              args.addConst("threadRegister", registers.getThreadRegister());
              args.addConst("trace", traceBarrier(readBarrier.graph()));
              args.addConst("counters", counters);
!             template(readBarrier.getDebug(), args).instantiate(providers.getMetaAccess(), readBarrier, DEFAULT_REPLACER, args);
          }
  
          public void lower(G1PostWriteBarrier writeBarrierPost, HotSpotRegistersProvider registers, LoweringTool tool) {
              StructuredGraph graph = writeBarrierPost.graph();
              if (writeBarrierPost.alwaysNull()) {

*** 509,537 ****
--- 511,539 ----
  
              args.addConst("usePrecise", writeBarrierPost.usePrecise());
              args.addConst("threadRegister", registers.getThreadRegister());
              args.addConst("trace", traceBarrier(writeBarrierPost.graph()));
              args.addConst("counters", counters);
!             template(graph.getDebug(), args).instantiate(providers.getMetaAccess(), writeBarrierPost, DEFAULT_REPLACER, args);
          }
  
          public void lower(G1ArrayRangePreWriteBarrier arrayRangeWriteBarrier, HotSpotRegistersProvider registers, LoweringTool tool) {
              Arguments args = new Arguments(g1ArrayRangePreWriteBarrier, arrayRangeWriteBarrier.graph().getGuardsStage(), tool.getLoweringStage());
              args.add("object", arrayRangeWriteBarrier.getObject());
              args.add("startIndex", arrayRangeWriteBarrier.getStartIndex());
              args.add("length", arrayRangeWriteBarrier.getLength());
              args.addConst("threadRegister", registers.getThreadRegister());
!             template(arrayRangeWriteBarrier.getDebug(), args).instantiate(providers.getMetaAccess(), arrayRangeWriteBarrier, DEFAULT_REPLACER, args);
          }
  
          public void lower(G1ArrayRangePostWriteBarrier arrayRangeWriteBarrier, HotSpotRegistersProvider registers, LoweringTool tool) {
              Arguments args = new Arguments(g1ArrayRangePostWriteBarrier, arrayRangeWriteBarrier.graph().getGuardsStage(), tool.getLoweringStage());
              args.add("object", arrayRangeWriteBarrier.getObject());
              args.add("startIndex", arrayRangeWriteBarrier.getStartIndex());
              args.add("length", arrayRangeWriteBarrier.getLength());
              args.addConst("threadRegister", registers.getThreadRegister());
!             template(arrayRangeWriteBarrier.getDebug(), args).instantiate(providers.getMetaAccess(), arrayRangeWriteBarrier, DEFAULT_REPLACER, args);
          }
      }
  
      /**
       * Log method of debugging purposes.