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

*** 26,36 ****
--- 26,36 ----
  import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability;
  import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER;
  
  import org.graalvm.compiler.api.replacements.Snippet;
  import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
! import org.graalvm.compiler.debug.DebugHandlersFactory;
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.nodes.calc.FloatConvertNode;
  import org.graalvm.compiler.nodes.spi.LoweringTool;
  import org.graalvm.compiler.options.OptionValues;
  import org.graalvm.compiler.phases.util.Providers;

*** 153,164 ****
--- 153,164 ----
          private final SnippetInfo f2i;
          private final SnippetInfo f2l;
          private final SnippetInfo d2i;
          private final SnippetInfo d2l;
  
!         public Templates(OptionValues options, Iterable<DebugHandlersFactory> factories, Providers providers, SnippetReflectionProvider snippetReflection, TargetDescription target) {
!             super(options, providers, snippetReflection, target);
!             super(options, factories, providers, snippetReflection, target);
  
              f2i = snippet(AMD64ConvertSnippets.class, "f2i");
              f2l = snippet(AMD64ConvertSnippets.class, "f2l");
              d2i = snippet(AMD64ConvertSnippets.class, "d2i");
              d2l = snippet(AMD64ConvertSnippets.class, "d2l");

*** 187,198 ****
--- 187,198 ----
  
              Arguments args = new Arguments(key, graph.getGuardsStage(), tool.getLoweringStage());
              args.add("input", convert.getValue());
              args.add("result", graph.unique(new AMD64FloatConvertNode(convert.getFloatConvert(), convert.getValue())));
  
!             SnippetTemplate template = template(convert.getDebug(), args);
!             convert.getDebug().log("Lowering %s in %s: node=%s, template=%s, arguments=%s", convert.getFloatConvert(), graph, convert, template, args);
              template.instantiate(providers.getMetaAccess(), convert, DEFAULT_REPLACER, tool, args);
              convert.safeDelete();
          }
      }
  }