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

*** 24,34 ****
--- 24,36 ----
  
  package org.graalvm.compiler.hotspot;
  
  import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
  import org.graalvm.compiler.bytecode.BytecodeProvider;
+ import org.graalvm.compiler.hotspot.meta.HotSpotWordOperationPlugin;
  import org.graalvm.compiler.hotspot.word.HotSpotOperation;
+ import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderPlugin;
  import org.graalvm.compiler.options.OptionValues;
  import org.graalvm.compiler.phases.util.Providers;
  import org.graalvm.compiler.printer.GraalDebugHandlersFactory;
  import org.graalvm.compiler.replacements.ReplacementsImpl;
  
*** 38,52 ****
  /**
   * Filters certain method substitutions based on whether there is underlying hardware support for
   * them.
   */
  public class HotSpotReplacementsImpl extends ReplacementsImpl {
- 
      public HotSpotReplacementsImpl(OptionValues options, Providers providers, SnippetReflectionProvider snippetReflection, BytecodeProvider bytecodeProvider, TargetDescription target) {
          super(options, new GraalDebugHandlersFactory(snippetReflection), providers, snippetReflection, bytecodeProvider, target);
      }
  
      @Override
!     protected boolean hasGenericInvocationPluginAnnotation(ResolvedJavaMethod method) {
!         return method.getAnnotation(HotSpotOperation.class) != null || super.hasGenericInvocationPluginAnnotation(method);
      }
  }
--- 40,66 ----
  /**
   * Filters certain method substitutions based on whether there is underlying hardware support for
   * them.
   */
  public class HotSpotReplacementsImpl extends ReplacementsImpl {
      public HotSpotReplacementsImpl(OptionValues options, Providers providers, SnippetReflectionProvider snippetReflection, BytecodeProvider bytecodeProvider, TargetDescription target) {
          super(options, new GraalDebugHandlersFactory(snippetReflection), providers, snippetReflection, bytecodeProvider, target);
      }
  
      @Override
!     public Class<? extends GraphBuilderPlugin> getIntrinsifyingPlugin(ResolvedJavaMethod method) {
!         return method.getAnnotation(HotSpotOperation.class) != null ? HotSpotWordOperationPlugin.class : super.getIntrinsifyingPlugin(method);
!     }
! 
!     private boolean snippetRegistrationClosed;
! 
!     @Override
!     public void registerSnippet(ResolvedJavaMethod method, ResolvedJavaMethod original, Object receiver, boolean trackNodeSourcePosition) {
!         assert !snippetRegistrationClosed;
!         super.registerSnippet(method, original, receiver, trackNodeSourcePosition);
!     }
! 
!     @Override
!     public void closeSnippetRegistration() {
!         snippetRegistrationClosed = true;
      }
  }