src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackendFactory.java

*** 23,33 ****
  
  
  package org.graalvm.compiler.hotspot.amd64;
  
  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;
--- 23,32 ----
*** 139,149 ****
              }
              try (InitTimer rt = timer("create Replacements provider")) {
                  replacements = createReplacements(options, p, snippetReflection, bytecodeProvider);
              }
              try (InitTimer rt = timer("create GraphBuilderPhase plugins")) {
!                 plugins = createGraphBuilderPlugins(compilerConfiguration, config, options, target, constantReflection, foreignCalls, metaAccess, snippetReflection, replacements, wordTypes);
                  replacements.setGraphBuilderPlugins(plugins);
              }
              try (InitTimer rt = timer("create Suites provider")) {
                  suites = createSuites(config, graalRuntime, compilerConfiguration, plugins, registers, replacements, options);
              }
--- 138,148 ----
              }
              try (InitTimer rt = timer("create Replacements provider")) {
                  replacements = createReplacements(options, p, snippetReflection, bytecodeProvider);
              }
              try (InitTimer rt = timer("create GraphBuilderPhase plugins")) {
!                 plugins = createGraphBuilderPlugins(compilerConfiguration, config, target, constantReflection, foreignCalls, metaAccess, snippetReflection, replacements, wordTypes);
                  replacements.setGraphBuilderPlugins(plugins);
              }
              try (InitTimer rt = timer("create Suites provider")) {
                  suites = createSuites(config, graalRuntime, compilerConfiguration, plugins, registers, replacements, options);
              }
*** 155,169 ****
          try (InitTimer rt = timer("instantiate backend")) {
              return createBackend(config, graalRuntime, providers);
          }
      }
  
!     protected Plugins createGraphBuilderPlugins(CompilerConfiguration compilerConfiguration, GraalHotSpotVMConfig config, OptionValues options, TargetDescription target,
                      HotSpotConstantReflectionProvider constantReflection, HotSpotHostForeignCallsProvider foreignCalls, HotSpotMetaAccessProvider metaAccess,
                      HotSpotSnippetReflectionProvider snippetReflection, HotSpotReplacementsImpl replacements, HotSpotWordTypes wordTypes) {
          Plugins plugins = HotSpotGraphBuilderPlugins.create(compilerConfiguration, config, wordTypes, metaAccess, constantReflection, snippetReflection, foreignCalls, replacements);
!         AMD64GraphBuilderPlugins.register(plugins, replacements.getDefaultReplacementBytecodeProvider(), (AMD64) target.arch, GraalArithmeticStubs.getValue(options), false);
          return plugins;
      }
  
      protected AMD64HotSpotBackend createBackend(GraalHotSpotVMConfig config, HotSpotGraalRuntimeProvider runtime, HotSpotProviders providers) {
          return new AMD64HotSpotBackend(config, runtime, providers);
--- 154,168 ----
          try (InitTimer rt = timer("instantiate backend")) {
              return createBackend(config, graalRuntime, providers);
          }
      }
  
!     protected Plugins createGraphBuilderPlugins(CompilerConfiguration compilerConfiguration, GraalHotSpotVMConfig config, TargetDescription target,
                      HotSpotConstantReflectionProvider constantReflection, HotSpotHostForeignCallsProvider foreignCalls, HotSpotMetaAccessProvider metaAccess,
                      HotSpotSnippetReflectionProvider snippetReflection, HotSpotReplacementsImpl replacements, HotSpotWordTypes wordTypes) {
          Plugins plugins = HotSpotGraphBuilderPlugins.create(compilerConfiguration, config, wordTypes, metaAccess, constantReflection, snippetReflection, foreignCalls, replacements);
!         AMD64GraphBuilderPlugins.register(plugins, replacements.getDefaultReplacementBytecodeProvider(), (AMD64) target.arch, false);
          return plugins;
      }
  
      protected AMD64HotSpotBackend createBackend(GraalHotSpotVMConfig config, HotSpotGraalRuntimeProvider runtime, HotSpotProviders providers) {
          return new AMD64HotSpotBackend(config, runtime, providers);