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

rev 56282 : [mq]: graal

*** 146,156 ****
              }
              try (InitTimer rt = timer("create Replacements provider")) {
                  replacements = createReplacements(target, p, snippetReflection, bytecodeProvider);
              }
              try (InitTimer rt = timer("create GraphBuilderPhase plugins")) {
!                 plugins = createGraphBuilderPlugins(compilerConfiguration, config, target, constantReflection, foreignCalls, metaAccess, snippetReflection, replacements, wordTypes, options);
                  replacements.setGraphBuilderPlugins(plugins);
              }
              try (InitTimer rt = timer("create Suites provider")) {
                  suites = createSuites(config, graalRuntime, compilerConfiguration, plugins, registers, replacements, options);
              }
--- 146,157 ----
              }
              try (InitTimer rt = timer("create Replacements provider")) {
                  replacements = createReplacements(target, p, snippetReflection, bytecodeProvider);
              }
              try (InitTimer rt = timer("create GraphBuilderPhase plugins")) {
!                 plugins = createGraphBuilderPlugins(graalRuntime, compilerConfiguration, config, target, constantReflection, foreignCalls, metaAccess, snippetReflection, replacements, wordTypes,
!                                 options);
                  replacements.setGraphBuilderPlugins(plugins);
              }
              try (InitTimer rt = timer("create Suites provider")) {
                  suites = createSuites(config, graalRuntime, compilerConfiguration, plugins, registers, replacements, options);
              }
*** 161,174 ****
          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, OptionValues options) {
!         Plugins plugins = HotSpotGraphBuilderPlugins.create(compilerConfiguration, config, wordTypes, metaAccess, constantReflection, snippetReflection, foreignCalls, replacements, options);
          AMD64GraphBuilderPlugins.register(plugins, replacements.getDefaultReplacementBytecodeProvider(), (AMD64) target.arch, false, JavaVersionUtil.JAVA_SPEC >= 9, config.useFMAIntrinsics);
          return plugins;
      }
  
      protected AMD64HotSpotBackend createBackend(GraalHotSpotVMConfig config, HotSpotGraalRuntimeProvider runtime, HotSpotProviders providers) {
--- 162,193 ----
          try (InitTimer rt = timer("instantiate backend")) {
              return createBackend(config, graalRuntime, providers);
          }
      }
  
!     protected Plugins createGraphBuilderPlugins(HotSpotGraalRuntimeProvider graalRuntime,
!                     CompilerConfiguration compilerConfiguration,
!                     GraalHotSpotVMConfig config,
!                     TargetDescription target,
!                     HotSpotConstantReflectionProvider constantReflection,
!                     HotSpotHostForeignCallsProvider foreignCalls,
!                     HotSpotMetaAccessProvider metaAccess,
!                     HotSpotSnippetReflectionProvider snippetReflection,
!                     HotSpotReplacementsImpl replacements,
!                     HotSpotWordTypes wordTypes,
!                     OptionValues options) {
!         Plugins plugins = HotSpotGraphBuilderPlugins.create(
!                         graalRuntime,
!                         compilerConfiguration,
!                         config,
!                         wordTypes,
!                         metaAccess,
!                         constantReflection,
!                         snippetReflection,
!                         foreignCalls,
!                         replacements,
!                         options);
          AMD64GraphBuilderPlugins.register(plugins, replacements.getDefaultReplacementBytecodeProvider(), (AMD64) target.arch, false, JavaVersionUtil.JAVA_SPEC >= 9, config.useFMAIntrinsics);
          return plugins;
      }
  
      protected AMD64HotSpotBackend createBackend(GraalHotSpotVMConfig config, HotSpotGraalRuntimeProvider runtime, HotSpotProviders providers) {