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

*** 20,32 ****
--- 20,31 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.hotspot.amd64;
  
  import static org.graalvm.compiler.hotspot.HotSpotBackend.Options.GraalArithmeticStubs;
  import static jdk.vm.ci.common.InitTimer.timer;
  
+ import static org.graalvm.compiler.hotspot.HotSpotBackend.Options.GraalArithmeticStubs;
  import java.util.ArrayList;
  import java.util.List;
  
  import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
  import org.graalvm.compiler.bytecode.BytecodeProvider;

*** 50,59 ****
--- 49,59 ----
  import org.graalvm.compiler.hotspot.nodes.HotSpotNodeCostProvider;
  import org.graalvm.compiler.hotspot.word.HotSpotWordTypes;
  import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
  import org.graalvm.compiler.nodes.spi.NodeCostProvider;
  import org.graalvm.compiler.nodes.spi.Replacements;
+ import org.graalvm.compiler.options.OptionValues;
  import org.graalvm.compiler.phases.tiers.CompilerConfiguration;
  import org.graalvm.compiler.phases.util.Providers;
  import org.graalvm.compiler.replacements.amd64.AMD64GraphBuilderPlugins;
  import org.graalvm.compiler.replacements.classfile.ClassfileBytecodeProvider;
  import org.graalvm.compiler.serviceprovider.ServiceProvider;

*** 88,97 ****
--- 88,98 ----
      @Override
      @SuppressWarnings("try")
      public HotSpotBackend createBackend(HotSpotGraalRuntimeProvider graalRuntime, CompilerConfiguration compilerConfiguration, HotSpotJVMCIRuntimeProvider jvmciRuntime, HotSpotBackend host) {
          assert host == null;
  
+         OptionValues options = graalRuntime.getOptions();
          JVMCIBackend jvmci = jvmciRuntime.getHostJVMCIBackend();
          GraalHotSpotVMConfig config = graalRuntime.getVMConfig();
          HotSpotProviders providers;
          HotSpotRegistersProvider registers;
          HotSpotCodeCacheProvider codeCache = (HotSpotCodeCacheProvider) jvmci.getCodeCache();

*** 136,169 ****
--- 137,170 ----
              }
              try (InitTimer rt = timer("create Bytecode provider")) {
                  bytecodeProvider = new ClassfileBytecodeProvider(metaAccess, snippetReflection);
              }
              try (InitTimer rt = timer("create Replacements provider")) {
!                 replacements = createReplacements(options, p, snippetReflection, bytecodeProvider);
              }
              try (InitTimer rt = timer("create GraphBuilderPhase plugins")) {
!                 plugins = createGraphBuilderPlugins(config, options, target, constantReflection, foreignCalls, metaAccess, snippetReflection, replacements, wordTypes, stampProvider);
                  replacements.setGraphBuilderPlugins(plugins);
              }
              try (InitTimer rt = timer("create Suites provider")) {
!                 suites = createSuites(config, graalRuntime, compilerConfiguration, plugins, registers, replacements, options);
              }
              providers = new HotSpotProviders(metaAccess, codeCache, constantReflection, constantFieldProvider, foreignCalls, lowerer, replacements, nodeCostProvider, suites, registers,
                              snippetReflection, wordTypes,
                              plugins);
          }
          try (InitTimer rt = timer("instantiate backend")) {
              return createBackend(config, graalRuntime, providers);
          }
      }
  
!     protected Plugins createGraphBuilderPlugins(GraalHotSpotVMConfig config, OptionValues options, TargetDescription target, HotSpotConstantReflectionProvider constantReflection,
                      HotSpotHostForeignCallsProvider foreignCalls,
                      HotSpotMetaAccessProvider metaAccess, HotSpotSnippetReflectionProvider snippetReflection, HotSpotReplacementsImpl replacements, HotSpotWordTypes wordTypes,
                      HotSpotStampProvider stampProvider) {
          Plugins plugins = HotSpotGraphBuilderPlugins.create(config, wordTypes, metaAccess, constantReflection, snippetReflection, foreignCalls, stampProvider, replacements);
!         AMD64GraphBuilderPlugins.register(plugins, replacements.getReplacementBytecodeProvider(), (AMD64) target.arch, GraalArithmeticStubs.getValue(options));
          return plugins;
      }
  
      protected AMD64HotSpotBackend createBackend(GraalHotSpotVMConfig config, HotSpotGraalRuntimeProvider runtime, HotSpotProviders providers) {
          return new AMD64HotSpotBackend(config, runtime, providers);

*** 171,182 ****
--- 172,183 ----
  
      protected HotSpotRegistersProvider createRegisters() {
          return new HotSpotRegisters(AMD64.r15, AMD64.r12, AMD64.rsp);
      }
  
!     protected HotSpotReplacementsImpl createReplacements(OptionValues options, Providers p, SnippetReflectionProvider snippetReflection, BytecodeProvider bytecodeProvider) {
!         return new HotSpotReplacementsImpl(options, p, snippetReflection, bytecodeProvider, p.getCodeCache().getTarget());
      }
  
      protected AMD64HotSpotForeignCallsProvider createForeignCalls(HotSpotJVMCIRuntimeProvider jvmciRuntime, HotSpotGraalRuntimeProvider runtime, HotSpotMetaAccessProvider metaAccess,
                      HotSpotCodeCacheProvider codeCache, WordTypes wordTypes, Value[] nativeABICallerSaveRegisters) {
          return new AMD64HotSpotForeignCallsProvider(jvmciRuntime, runtime, metaAccess, codeCache, wordTypes, nativeABICallerSaveRegisters);

*** 184,195 ****
--- 185,197 ----
  
      /**
       * @param replacements
       */
      protected HotSpotSuitesProvider createSuites(GraalHotSpotVMConfig config, HotSpotGraalRuntimeProvider runtime, CompilerConfiguration compilerConfiguration, Plugins plugins,
!                     HotSpotRegistersProvider registers, Replacements replacements, OptionValues options) {
-         return new HotSpotSuitesProvider(new AMD64HotSpotSuitesProvider(compilerConfiguration, plugins), config, runtime, new AMD64HotSpotAddressLowering(config, registers.getHeapBaseRegister()));
+                         new AMD64HotSpotAddressLowering(config, registers.getHeapBaseRegister(), options));
      }
  
      protected HotSpotSnippetReflectionProvider createSnippetReflection(HotSpotGraalRuntimeProvider runtime, HotSpotConstantReflectionProvider constantReflection, WordTypes wordTypes) {
          return new HotSpotSnippetReflectionProvider(runtime, constantReflection, wordTypes);
      }