src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/UnsafeLoadSnippets.java

*** 26,38 ****
  import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER;
  
  import org.graalvm.compiler.api.replacements.Snippet;
  import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
  import org.graalvm.compiler.nodes.extended.FixedValueAnchorNode;
! import org.graalvm.compiler.nodes.extended.UnsafeLoadNode;
  import org.graalvm.compiler.nodes.memory.HeapAccess.BarrierType;
  import org.graalvm.compiler.nodes.spi.LoweringTool;
  import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates;
  import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
  import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
  import org.graalvm.compiler.replacements.Snippets;
  import org.graalvm.compiler.word.Word;
--- 26,39 ----
  import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER;
  
  import org.graalvm.compiler.api.replacements.Snippet;
  import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
  import org.graalvm.compiler.nodes.extended.FixedValueAnchorNode;
! import org.graalvm.compiler.nodes.extended.RawLoadNode;
  import org.graalvm.compiler.nodes.memory.HeapAccess.BarrierType;
  import org.graalvm.compiler.nodes.spi.LoweringTool;
+ import org.graalvm.compiler.options.OptionValues;
  import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates;
  import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
  import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
  import org.graalvm.compiler.replacements.Snippets;
  import org.graalvm.compiler.word.Word;
*** 53,67 ****
  
      public static class Templates extends AbstractTemplates {
  
          private final SnippetInfo unsafeLoad = snippet(UnsafeLoadSnippets.class, "lowerUnsafeLoad");
  
!         public Templates(HotSpotProviders providers, TargetDescription target) {
!             super(providers, providers.getSnippetReflection(), target);
          }
  
!         public void lower(UnsafeLoadNode load, LoweringTool tool) {
              Arguments args = new Arguments(unsafeLoad, load.graph().getGuardsStage(), tool.getLoweringStage());
              args.add("object", load.object());
              args.add("offset", load.offset());
              template(args).instantiate(providers.getMetaAccess(), load, DEFAULT_REPLACER, args);
          }
--- 54,68 ----
  
      public static class Templates extends AbstractTemplates {
  
          private final SnippetInfo unsafeLoad = snippet(UnsafeLoadSnippets.class, "lowerUnsafeLoad");
  
!         public Templates(OptionValues options, HotSpotProviders providers, TargetDescription target) {
!             super(options, providers, providers.getSnippetReflection(), target);
          }
  
!         public void lower(RawLoadNode load, LoweringTool tool) {
              Arguments args = new Arguments(unsafeLoad, load.graph().getGuardsStage(), tool.getLoweringStage());
              args.add("object", load.object());
              args.add("offset", load.offset());
              template(args).instantiate(providers.getMetaAccess(), load, DEFAULT_REPLACER, args);
          }