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

*** 24,43 ****
--- 24,47 ----
  
  import static jdk.vm.ci.code.CodeUtil.K;
  import static jdk.vm.ci.code.CodeUtil.getCallingConvention;
  import static jdk.vm.ci.common.InitTimer.timer;
  
+ import java.util.Collections;
+ 
  import org.graalvm.compiler.core.common.NumUtil;
  import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
+ import org.graalvm.compiler.debug.DebugHandlersFactory;
  import org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider;
  import org.graalvm.compiler.hotspot.meta.HotSpotLoweringProvider;
  import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
  import org.graalvm.compiler.hotspot.stubs.Stub;
  import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
  import org.graalvm.compiler.lir.framemap.ReferenceMapBuilder;
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.options.OptionValues;
+ import org.graalvm.compiler.printer.GraalDebugHandlersFactory;
  
  import jdk.vm.ci.code.CallingConvention;
  import jdk.vm.ci.common.InitTimer;
  import jdk.vm.ci.hotspot.HotSpotCallingConventionType;
  import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;

*** 75,85 ****
--- 79,90 ----
  
          try (InitTimer st = timer("foreignCalls.initialize")) {
              foreignCalls.initialize(providers, options);
          }
          try (InitTimer st = timer("lowerer.initialize")) {
!             lowerer.initialize(options, providers, config);
!             Iterable<DebugHandlersFactory> factories = Collections.singletonList(new GraalDebugHandlersFactory(providers.getSnippetReflection()));
+             lowerer.initialize(options, factories, providers, config);
          }
      }
  
      protected CallingConvention makeCallingConvention(StructuredGraph graph, Stub stub) {
          if (stub != null) {