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

*** 47,56 ****
--- 47,57 ----
  import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
  import org.graalvm.compiler.core.common.type.ObjectStamp;
  import org.graalvm.compiler.core.common.type.Stamp;
  import org.graalvm.compiler.core.common.type.StampFactory;
  import org.graalvm.compiler.core.common.type.StampPair;
+ import org.graalvm.compiler.debug.DebugHandlersFactory;
  import org.graalvm.compiler.debug.GraalError;
  import org.graalvm.compiler.graph.Node;
  import org.graalvm.compiler.graph.NodeInputList;
  import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
  import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider;

*** 197,225 ****
--- 198,226 ----
          this.registers = registers;
          this.constantReflection = constantReflection;
      }
  
      @Override
!     public void initialize(OptionValues options, Iterable<DebugHandlersFactory> factories, HotSpotProviders providers, GraalHotSpotVMConfig config) {
!         super.initialize(options, factories, runtime, providers, providers.getSnippetReflection());
  
          assert target == providers.getCodeCache().getTarget();
!         instanceofSnippets = new InstanceOfSnippets.Templates(options, factories, runtime, providers, target);
!         newObjectSnippets = new NewObjectSnippets.Templates(options, factories, runtime, providers, target, config);
!         monitorSnippets = new MonitorSnippets.Templates(options, factories, runtime, providers, target, config.useFastLocking);
!         writeBarrierSnippets = new WriteBarrierSnippets.Templates(options, factories, runtime, providers, target, config.useCompressedOops ? config.getOopEncoding() : null);
!         exceptionObjectSnippets = new LoadExceptionObjectSnippets.Templates(options, factories, providers, target);
!         unsafeLoadSnippets = new UnsafeLoadSnippets.Templates(options, factories, providers, target);
!         assertionSnippets = new AssertionSnippets.Templates(options, factories, providers, target);
!         arraycopySnippets = new ArrayCopySnippets.Templates(options, factories, runtime, providers, target);
!         stringToBytesSnippets = new StringToBytesSnippets.Templates(options, factories, providers, target);
!         hashCodeSnippets = new HashCodeSnippets.Templates(options, factories, providers, target);
          if (GeneratePIC.getValue(options)) {
!             resolveConstantSnippets = new ResolveConstantSnippets.Templates(options, factories, providers, target);
!             profileSnippets = new ProfileSnippets.Templates(options, factories, providers, target);
          }
!         providers.getReplacements().registerSnippetTemplateCache(new UnsafeArrayCopySnippets.Templates(options, factories, providers, target));
      }
  
      public MonitorSnippets.Templates getMonitorSnippets() {
          return monitorSnippets;
      }