*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotHostBackend.java	Mon Mar 20 17:38:34 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotHostBackend.java	Mon Mar 20 17:38:34 2017

*** 27,42 ****
--- 27,41 ----
  
  import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
  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.DeoptimizationStub;
  import org.graalvm.compiler.hotspot.stubs.Stub;
  import org.graalvm.compiler.hotspot.stubs.UncommonTrapStub;
  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 jdk.vm.ci.code.CallingConvention;
  import jdk.vm.ci.common.InitTimer;
  import jdk.vm.ci.hotspot.HotSpotCallingConventionType;
  import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;

*** 47,66 ****
--- 46,61 ----
   * Common functionality of HotSpot host backends.
   */
  public abstract class HotSpotHostBackend extends HotSpotBackend {
  
      /**
!      * Descriptor for {@code SharedRuntime::deopt_blob()->unpack()} or
       * {@link DeoptimizationStub#deoptimizationHandler} depending on
       * {@link HotSpotBackend.Options#PreferGraalStubs}.
!      * Descriptor for {@code SharedRuntime::deopt_blob()->unpack()}.
       */
      public static final ForeignCallDescriptor DEOPTIMIZATION_HANDLER = new ForeignCallDescriptor("deoptHandler", void.class);
  
      /**
!      * Descriptor for {@code SharedRuntime::deopt_blob()->uncommon_trap()} or
       * {@link UncommonTrapStub#uncommonTrapHandler} depending on
       * {@link HotSpotBackend.Options#PreferGraalStubs}.
!      * Descriptor for {@code SharedRuntime::deopt_blob()->uncommon_trap()}.
       */
      public static final ForeignCallDescriptor UNCOMMON_TRAP_HANDLER = new ForeignCallDescriptor("uncommonTrapHandler", void.class);
  
      protected final GraalHotSpotVMConfig config;
  

*** 69,88 ****
--- 64,83 ----
          this.config = config;
      }
  
      @Override
      @SuppressWarnings("try")
!     public void completeInitialization(HotSpotJVMCIRuntime jvmciRuntime, OptionValues options) {
          final HotSpotProviders providers = getProviders();
          HotSpotHostForeignCallsProvider foreignCalls = (HotSpotHostForeignCallsProvider) providers.getForeignCalls();
          final HotSpotLoweringProvider lowerer = (HotSpotLoweringProvider) providers.getLowerer();
  
          try (InitTimer st = timer("foreignCalls.initialize")) {
!             foreignCalls.initialize(providers, options);
          }
          try (InitTimer st = timer("lowerer.initialize")) {
!             lowerer.initialize(options, providers, config);
          }
      }
  
      protected CallingConvention makeCallingConvention(StructuredGraph graph, Stub stub) {
          if (stub != null) {