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

*** 20,97 ****
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.hotspot.replacements.arraycopy;
  
- import jdk.vm.ci.code.BytecodeFrame;
- import jdk.vm.ci.meta.JavaKind;
- 
- import static org.graalvm.word.LocationIdentity.any;
- 
  import org.graalvm.compiler.graph.NodeClass;
- import org.graalvm.compiler.hotspot.word.KlassPointer;
  import org.graalvm.compiler.nodeinfo.InputType;
  import org.graalvm.compiler.nodeinfo.NodeInfo;
- import org.graalvm.compiler.nodes.NamedLocationIdentity;
  import org.graalvm.compiler.nodes.ValueNode;
  import org.graalvm.compiler.nodes.type.StampTool;
  import org.graalvm.compiler.replacements.SnippetTemplate;
  import org.graalvm.compiler.replacements.nodes.BasicArrayCopyNode;
! import org.graalvm.word.LocationIdentity;
  
  @NodeInfo(allowedUsageTypes = InputType.Memory)
! public final class ArrayCopySlowPathNode extends BasicArrayCopyNode {
  
!     public static final NodeClass<ArrayCopySlowPathNode> TYPE = NodeClass.create(ArrayCopySlowPathNode.class);
  
      private final SnippetTemplate.SnippetInfo snippet;
  
!     /**
!      * Extra context for the slow path snippet.
!      */
!     private final Object argument;
! 
!     /**
!      * AOT compilation requires klass constants to be exposed after the first lowering to be handled
!      * automatically. Lowering for {@link ArrayCopySlowPathNode}, with snippet ==
!      * {@link ArrayCopySnippets#arraycopyPredictedObjectWork}, requires a klass of Object[]. For
!      * other snippets {@link #predictedKlass} is a null constant.
!      */
!     @Input protected ValueNode predictedKlass;
! 
!     public ArrayCopySlowPathNode(ValueNode src, ValueNode srcPos, ValueNode dest, ValueNode destPos, ValueNode length, ValueNode predictedKlass, JavaKind elementKind,
!                     SnippetTemplate.SnippetInfo snippet, Object argument) {
          super(TYPE, src, srcPos, dest, destPos, length, elementKind, BytecodeFrame.INVALID_FRAMESTATE_BCI);
          assert StampTool.isPointerNonNull(src) && StampTool.isPointerNonNull(dest) : "must have been null checked";
          this.snippet = snippet;
-         this.argument = argument;
-         this.predictedKlass = predictedKlass;
      }
  
      @NodeIntrinsic
!     public static native void arraycopy(Object nonNullSrc, int srcPos, Object nonNullDest, int destPos, int length, KlassPointer predictedKlass,
!                     @ConstantNodeParameter JavaKind elementKind, @ConstantNodeParameter SnippetTemplate.SnippetInfo snippet, @ConstantNodeParameter Object argument);
  
      public SnippetTemplate.SnippetInfo getSnippet() {
          return snippet;
      }
  
-     public Object getArgument() {
-         return argument;
-     }
- 
-     @Override
-     public LocationIdentity getLocationIdentity() {
-         if (elementKind != null) {
-             return NamedLocationIdentity.getArrayLocation(elementKind);
-         }
-         return any();
-     }
- 
      public void setBci(int bci) {
          this.bci = bci;
      }
- 
-     public ValueNode getPredictedKlass() {
-         return predictedKlass;
-     }
  }
--- 20,60 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.hotspot.replacements.arraycopy;
  
  import org.graalvm.compiler.graph.NodeClass;
  import org.graalvm.compiler.nodeinfo.InputType;
  import org.graalvm.compiler.nodeinfo.NodeInfo;
  import org.graalvm.compiler.nodes.ValueNode;
  import org.graalvm.compiler.nodes.type.StampTool;
  import org.graalvm.compiler.replacements.SnippetTemplate;
  import org.graalvm.compiler.replacements.nodes.BasicArrayCopyNode;
! 
! import jdk.vm.ci.code.BytecodeFrame;
! import jdk.vm.ci.meta.JavaKind;
  
  @NodeInfo(allowedUsageTypes = InputType.Memory)
! public final class ArrayCopyWithSlowPathNode extends BasicArrayCopyNode {
  
!     public static final NodeClass<ArrayCopyWithSlowPathNode> TYPE = NodeClass.create(ArrayCopyWithSlowPathNode.class);
  
      private final SnippetTemplate.SnippetInfo snippet;
  
!     public ArrayCopyWithSlowPathNode(ValueNode src, ValueNode srcPos, ValueNode dest, ValueNode destPos, ValueNode length, SnippetTemplate.SnippetInfo snippet, JavaKind elementKind) {
          super(TYPE, src, srcPos, dest, destPos, length, elementKind, BytecodeFrame.INVALID_FRAMESTATE_BCI);
          assert StampTool.isPointerNonNull(src) && StampTool.isPointerNonNull(dest) : "must have been null checked";
          this.snippet = snippet;
      }
  
      @NodeIntrinsic
!     public static native void arraycopy(Object nonNullSrc, int srcPos, Object nonNullDest, int destPos, int length, @ConstantNodeParameter SnippetTemplate.SnippetInfo snippet,
!                     @ConstantNodeParameter JavaKind elementKind);
  
      public SnippetTemplate.SnippetInfo getSnippet() {
          return snippet;
      }
  
      public void setBci(int bci) {
          this.bci = bci;
      }
  }