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

rev 56282 : [mq]: graal

*** 1,7 ****
  /*
!  * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
   * Copyright (c) 2018, Red Hat Inc. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
--- 1,7 ----
  /*
!  * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
   * Copyright (c) 2018, Red Hat Inc. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
*** 153,163 ****
              }
              try (InitTimer rt = timer("create Replacements provider")) {
                  replacements = createReplacements(target, p, snippetReflection, bytecodeProvider);
              }
              try (InitTimer rt = timer("create GraphBuilderPhase plugins")) {
!                 plugins = createGraphBuilderPlugins(compilerConfiguration, config, constantReflection, foreignCalls, metaAccess, snippetReflection, replacements, wordTypes, graalRuntime.getOptions());
                  replacements.setGraphBuilderPlugins(plugins);
              }
              try (InitTimer rt = timer("create Suites provider")) {
                  suites = createSuites(config, graalRuntime, compilerConfiguration, plugins, replacements);
              }
--- 153,164 ----
              }
              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, constantReflection, foreignCalls, metaAccess, snippetReflection, replacements, wordTypes,
!                                 graalRuntime.getOptions());
                  replacements.setGraphBuilderPlugins(plugins);
              }
              try (InitTimer rt = timer("create Suites provider")) {
                  suites = createSuites(config, graalRuntime, compilerConfiguration, plugins, replacements);
              }
*** 168,182 ****
          try (InitTimer rt = timer("instantiate backend")) {
              return createBackend(config, graalRuntime, providers);
          }
      }
  
!     protected Plugins createGraphBuilderPlugins(CompilerConfiguration compilerConfiguration, GraalHotSpotVMConfig config, 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);
!         AArch64GraphBuilderPlugins.register(plugins, replacements.getDefaultReplacementBytecodeProvider(), false, //
                          /* registerMathPlugins */true);
          return plugins;
      }
  
      protected AArch64HotSpotBackend createBackend(GraalHotSpotVMConfig config, HotSpotGraalRuntimeProvider runtime, HotSpotProviders providers) {
--- 169,199 ----
          try (InitTimer rt = timer("instantiate backend")) {
              return createBackend(config, graalRuntime, providers);
          }
      }
  
!     protected Plugins createGraphBuilderPlugins(HotSpotGraalRuntimeProvider graalRuntime,
!                     CompilerConfiguration compilerConfiguration,
!                     GraalHotSpotVMConfig config,
!                     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);
!         AArch64GraphBuilderPlugins.register(plugins, replacements.getDefaultReplacementBytecodeProvider(), false,
                          /* registerMathPlugins */true);
          return plugins;
      }
  
      protected AArch64HotSpotBackend createBackend(GraalHotSpotVMConfig config, HotSpotGraalRuntimeProvider runtime, HotSpotProviders providers) {