src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackendFactory.java

rev 52509 : [mq]: graal

*** 54,64 ****
  import org.graalvm.compiler.hotspot.meta.HotSpotSnippetReflectionProvider;
  import org.graalvm.compiler.hotspot.meta.HotSpotStampProvider;
  import org.graalvm.compiler.hotspot.meta.HotSpotSuitesProvider;
  import org.graalvm.compiler.hotspot.word.HotSpotWordTypes;
  import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
- import org.graalvm.compiler.nodes.spi.LoweringProvider;
  import org.graalvm.compiler.nodes.spi.Replacements;
  import org.graalvm.compiler.options.OptionValues;
  import org.graalvm.compiler.phases.Phase;
  import org.graalvm.compiler.phases.common.AddressLoweringByUsePhase;
  import org.graalvm.compiler.phases.schedule.SchedulePhase;
--- 54,63 ----
*** 146,156 ****
              }
              try (InitTimer rt = timer("create Replacements provider")) {
                  replacements = createReplacements(graalRuntime.getOptions(), p, snippetReflection, bytecodeProvider);
              }
              try (InitTimer rt = timer("create GraphBuilderPhase plugins")) {
!                 plugins = createGraphBuilderPlugins(compilerConfiguration, config, constantReflection, foreignCalls, lowerer, metaAccess, snippetReflection, replacements, wordTypes, stampProvider);
                  replacements.setGraphBuilderPlugins(plugins);
              }
              try (InitTimer rt = timer("create Suites provider")) {
                  suites = createSuites(config, graalRuntime, compilerConfiguration, plugins, replacements);
              }
--- 145,155 ----
              }
              try (InitTimer rt = timer("create Replacements provider")) {
                  replacements = createReplacements(graalRuntime.getOptions(), p, snippetReflection, bytecodeProvider);
              }
              try (InitTimer rt = timer("create GraphBuilderPhase plugins")) {
!                 plugins = createGraphBuilderPlugins(compilerConfiguration, config, constantReflection, foreignCalls, metaAccess, snippetReflection, replacements, wordTypes);
                  replacements.setGraphBuilderPlugins(plugins);
              }
              try (InitTimer rt = timer("create Suites provider")) {
                  suites = createSuites(config, graalRuntime, compilerConfiguration, plugins, replacements);
              }
*** 162,175 ****
              return createBackend(config, graalRuntime, providers);
          }
      }
  
      protected Plugins createGraphBuilderPlugins(CompilerConfiguration compilerConfiguration, GraalHotSpotVMConfig config, HotSpotConstantReflectionProvider constantReflection,
!                     HotSpotHostForeignCallsProvider foreignCalls, LoweringProvider lowerer, HotSpotMetaAccessProvider metaAccess, HotSpotSnippetReflectionProvider snippetReflection,
!                     HotSpotReplacementsImpl replacements, HotSpotWordTypes wordTypes, HotSpotStampProvider stampProvider) {
!         Plugins plugins = HotSpotGraphBuilderPlugins.create(compilerConfiguration, config, wordTypes, metaAccess, constantReflection, snippetReflection, foreignCalls, lowerer, stampProvider,
!                         replacements);
          AArch64GraphBuilderPlugins.register(plugins, replacements.getDefaultReplacementBytecodeProvider(), false);
          return plugins;
      }
  
      protected AArch64HotSpotBackend createBackend(GraalHotSpotVMConfig config, HotSpotGraalRuntimeProvider runtime, HotSpotProviders providers) {
--- 161,173 ----
              return createBackend(config, graalRuntime, providers);
          }
      }
  
      protected Plugins createGraphBuilderPlugins(CompilerConfiguration compilerConfiguration, GraalHotSpotVMConfig config, HotSpotConstantReflectionProvider constantReflection,
!                     HotSpotHostForeignCallsProvider foreignCalls, HotSpotMetaAccessProvider metaAccess, HotSpotSnippetReflectionProvider snippetReflection,
!                     HotSpotReplacementsImpl replacements, HotSpotWordTypes wordTypes) {
!         Plugins plugins = HotSpotGraphBuilderPlugins.create(compilerConfiguration, config, wordTypes, metaAccess, constantReflection, snippetReflection, foreignCalls, replacements);
          AArch64GraphBuilderPlugins.register(plugins, replacements.getDefaultReplacementBytecodeProvider(), false);
          return plugins;
      }
  
      protected AArch64HotSpotBackend createBackend(GraalHotSpotVMConfig config, HotSpotGraalRuntimeProvider runtime, HotSpotProviders providers) {