*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64IntegerArithmeticSnippets.java	Fri Jul  7 09:31:40 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.aarch64/src/org/graalvm/compiler/replacements/aarch64/AArch64IntegerArithmeticSnippets.java	Fri Jul  7 09:31:40 2017

*** 23,32 ****
--- 23,33 ----
  
  package org.graalvm.compiler.replacements.aarch64;
  
  import org.graalvm.compiler.api.replacements.Snippet;
  import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
+ import org.graalvm.compiler.debug.DebugHandlersFactory;
  import org.graalvm.compiler.debug.GraalError;
  import org.graalvm.compiler.graph.Node.NodeIntrinsic;
  import org.graalvm.compiler.graph.NodeClass;
  import org.graalvm.compiler.nodeinfo.NodeInfo;
  import org.graalvm.compiler.nodes.DeoptimizeNode;

*** 66,77 ****
--- 67,79 ----
      private final SnippetTemplate.SnippetInfo uidiv;
      private final SnippetTemplate.SnippetInfo uldiv;
      private final SnippetTemplate.SnippetInfo uirem;
      private final SnippetTemplate.SnippetInfo ulrem;
  
!     public AArch64IntegerArithmeticSnippets(OptionValues options, Providers providers, SnippetReflectionProvider snippetReflection, TargetDescription target) {
          super(options, providers, snippetReflection, target);
!     public AArch64IntegerArithmeticSnippets(OptionValues options, Iterable<DebugHandlersFactory> factories, Providers providers, SnippetReflectionProvider snippetReflection,
+                     TargetDescription target) {
+         super(options, factories, providers, snippetReflection, target);
          idiv = snippet(AArch64IntegerArithmeticSnippets.class, "idivSnippet");
          ldiv = snippet(AArch64IntegerArithmeticSnippets.class, "ldivSnippet");
          irem = snippet(AArch64IntegerArithmeticSnippets.class, "iremSnippet");
          lrem = snippet(AArch64IntegerArithmeticSnippets.class, "lremSnippet");
  

*** 101,111 ****
--- 103,113 ----
          }
          StructuredGraph graph = node.graph();
          Arguments args = new Arguments(snippet, graph.getGuardsStage(), tool.getLoweringStage());
          args.add("x", node.getX());
          args.add("y", node.getY());
!         template(graph.getDebug(), args).instantiate(providers.getMetaAccess(), node, SnippetTemplate.DEFAULT_REPLACER, args);
      }
  
      @Snippet
      public static int idivSnippet(int x, int y) {
          checkForZero(y);