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

*** 41,50 ****
--- 41,51 ----
  
  import org.graalvm.compiler.api.directives.GraalDirectives;
  import org.graalvm.compiler.api.replacements.Fold;
  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.debug.GraalError;
  import org.graalvm.compiler.graph.Node;
  import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
  import org.graalvm.compiler.hotspot.nodes.type.KlassPointerStamp;
  import org.graalvm.compiler.hotspot.word.KlassPointer;

*** 409,420 ****
--- 410,421 ----
          }
      }
  
      public static class Templates extends SnippetTemplate.AbstractTemplates {
  
!         public Templates(OptionValues options, Iterable<DebugHandlersFactory> factories, SnippetCounter.Group.Factory factory, HotSpotProviders providers, TargetDescription target) {
!             super(options, factories, providers, providers.getSnippetReflection(), target);
              this.counters = new Counters(factory);
          }
  
          private ResolvedJavaMethod originalArraycopy() throws GraalError {
              if (originalArraycopy == null) {

*** 615,625 ****
--- 616,626 ----
              args.add("srcPos", arraycopy.getSourcePosition());
              args.add("nonNullDest", arraycopy.getDestination());
              args.add("destPos", arraycopy.getDestinationPosition());
              args.addConst("length", arraycopy.getUnrollLength());
              args.addConst("elementKind", arraycopy.getElementKind());
!             template(graph.getDebug(), args).instantiate(providers.getMetaAccess(), arraycopy, SnippetTemplate.DEFAULT_REPLACER, args);
          }
  
          /**
           * Instantiate the snippet template and fix up the FrameState of any Invokes of
           * System.arraycopy and propagate the captured bci in the ArrayCopySlowPathNode.

*** 627,637 ****
--- 628,638 ----
           * @param args
           * @param arraycopy
           */
          private void instantiate(Arguments args, BasicArrayCopyNode arraycopy) {
              StructuredGraph graph = arraycopy.graph();
!             SnippetTemplate template = template(graph.getDebug(), args);
              UnmodifiableEconomicMap<Node, Node> replacements = template.instantiate(providers.getMetaAccess(), arraycopy, SnippetTemplate.DEFAULT_REPLACER, args, false);
              for (Node originalNode : replacements.getKeys()) {
                  if (originalNode instanceof Invoke) {
                      Invoke invoke = (Invoke) replacements.get(originalNode);
                      assert invoke.asNode().graph() == graph;