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

*** 48,57 ****
--- 48,58 ----
  import org.graalvm.compiler.hotspot.meta.HotSpotSuitesProvider;
  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.options.OptionValues;
  import org.graalvm.compiler.phases.tiers.CompilerConfiguration;
  import org.graalvm.compiler.phases.util.Providers;
  import org.graalvm.compiler.replacements.aarch64.AArch64GraphBuilderPlugins;
  import org.graalvm.compiler.replacements.classfile.ClassfileBytecodeProvider;
  import org.graalvm.compiler.serviceprovider.ServiceProvider;

*** 135,145 ****
--- 136,146 ----
              }
              try (InitTimer rt = timer("create Bytecode provider")) {
                  bytecodeProvider = new ClassfileBytecodeProvider(metaAccess, snippetReflection);
              }
              try (InitTimer rt = timer("create Replacements provider")) {
!                 replacements = createReplacements(graalRuntime.getOptions(), p, snippetReflection, bytecodeProvider);
              }
              try (InitTimer rt = timer("create GraphBuilderPhase plugins")) {
                  plugins = createGraphBuilderPlugins(config, constantReflection, foreignCalls, metaAccess, snippetReflection, replacements, wordTypes, stampProvider);
                  replacements.setGraphBuilderPlugins(plugins);
              }

*** 157,167 ****
--- 158,168 ----
  
      protected Plugins createGraphBuilderPlugins(GraalHotSpotVMConfig config, 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);
-         AArch64GraphBuilderPlugins.register(plugins, foreignCalls, replacements.getReplacementBytecodeProvider());
          return plugins;
      }
  
      protected AArch64HotSpotBackend createBackend(GraalHotSpotVMConfig config, HotSpotGraalRuntimeProvider runtime, HotSpotProviders providers) {
          return new AArch64HotSpotBackend(config, runtime, providers);

*** 169,180 ****
--- 170,181 ----
  
      protected HotSpotRegistersProvider createRegisters() {
          return new HotSpotRegisters(AArch64HotSpotRegisterConfig.threadRegister, AArch64HotSpotRegisterConfig.heapBaseRegister, sp);
      }
  
!     protected HotSpotReplacementsImpl createReplacements(OptionValues options, Providers p, SnippetReflectionProvider snippetReflection, BytecodeProvider bytecodeProvider) {
!         return new HotSpotReplacementsImpl(p, snippetReflection, bytecodeProvider, p.getCodeCache().getTarget());
!         return new HotSpotReplacementsImpl(options, p, snippetReflection, bytecodeProvider, p.getCodeCache().getTarget());
      }
  
      protected HotSpotHostForeignCallsProvider createForeignCalls(HotSpotJVMCIRuntimeProvider jvmciRuntime, HotSpotGraalRuntimeProvider runtime, HotSpotMetaAccessProvider metaAccess,
                      HotSpotCodeCacheProvider codeCache, WordTypes wordTypes, Value[] nativeABICallerSaveRegisters) {
          return new AArch64HotSpotForeignCallsProvider(jvmciRuntime, runtime, metaAccess, codeCache, wordTypes, nativeABICallerSaveRegisters);