src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java

rev 52509 : [mq]: graal2

*** 89,100 ****
  import org.graalvm.compiler.nodes.java.InstanceOfDynamicNode;
  import org.graalvm.compiler.nodes.memory.HeapAccess.BarrierType;
  import org.graalvm.compiler.nodes.memory.ReadNode;
  import org.graalvm.compiler.nodes.memory.address.AddressNode;
  import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
- import org.graalvm.compiler.nodes.spi.LoweringProvider;
- import org.graalvm.compiler.nodes.spi.StampProvider;
  import org.graalvm.compiler.nodes.util.GraphUtil;
  import org.graalvm.compiler.options.OptionValues;
  import org.graalvm.compiler.phases.tiers.CompilerConfiguration;
  import org.graalvm.compiler.replacements.InlineDuringParsingPlugin;
  import org.graalvm.compiler.replacements.MethodHandlePlugin;
--- 89,98 ----
*** 124,142 ****
       * Creates a {@link Plugins} object that should be used when running on HotSpot.
       *
       * @param constantReflection
       * @param snippetReflection
       * @param foreignCalls
-      * @param stampProvider
       */
      public static Plugins create(CompilerConfiguration compilerConfiguration, GraalHotSpotVMConfig config, HotSpotWordTypes wordTypes, MetaAccessProvider metaAccess,
!                     ConstantReflectionProvider constantReflection, SnippetReflectionProvider snippetReflection, ForeignCallsProvider foreignCalls, LoweringProvider lowerer,
!                     StampProvider stampProvider, ReplacementsImpl replacements) {
          InvocationPlugins invocationPlugins = new HotSpotInvocationPlugins(config, compilerConfiguration);
  
          Plugins plugins = new Plugins(invocationPlugins);
!         NodeIntrinsificationProvider nodeIntrinsificationProvider = new NodeIntrinsificationProvider(metaAccess, snippetReflection, foreignCalls, lowerer, wordTypes);
          HotSpotWordOperationPlugin wordOperationPlugin = new HotSpotWordOperationPlugin(snippetReflection, wordTypes);
          HotSpotNodePlugin nodePlugin = new HotSpotNodePlugin(wordOperationPlugin);
  
          plugins.appendTypePlugin(nodePlugin);
          plugins.appendNodePlugin(nodePlugin);
--- 122,138 ----
       * Creates a {@link Plugins} object that should be used when running on HotSpot.
       *
       * @param constantReflection
       * @param snippetReflection
       * @param foreignCalls
       */
      public static Plugins create(CompilerConfiguration compilerConfiguration, GraalHotSpotVMConfig config, HotSpotWordTypes wordTypes, MetaAccessProvider metaAccess,
!                     ConstantReflectionProvider constantReflection, SnippetReflectionProvider snippetReflection, ForeignCallsProvider foreignCalls, ReplacementsImpl replacements) {
          InvocationPlugins invocationPlugins = new HotSpotInvocationPlugins(config, compilerConfiguration);
  
          Plugins plugins = new Plugins(invocationPlugins);
!         NodeIntrinsificationProvider nodeIntrinsificationProvider = new NodeIntrinsificationProvider(metaAccess, snippetReflection, foreignCalls, wordTypes);
          HotSpotWordOperationPlugin wordOperationPlugin = new HotSpotWordOperationPlugin(snippetReflection, wordTypes);
          HotSpotNodePlugin nodePlugin = new HotSpotNodePlugin(wordOperationPlugin);
  
          plugins.appendTypePlugin(nodePlugin);
          plugins.appendNodePlugin(nodePlugin);