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

*** 32,41 ****
--- 32,42 ----
  import static org.graalvm.compiler.hotspot.HotSpotBackend.DECRYPT_BLOCK_WITH_ORIGINAL_KEY;
  import static org.graalvm.compiler.hotspot.HotSpotBackend.DECRYPT_WITH_ORIGINAL_KEY;
  import static org.graalvm.compiler.hotspot.HotSpotBackend.ENCRYPT;
  import static org.graalvm.compiler.hotspot.HotSpotBackend.ENCRYPT_BLOCK;
  import static org.graalvm.compiler.hotspot.HotSpotBackend.EXCEPTION_HANDLER;
+ import static org.graalvm.compiler.hotspot.HotSpotBackend.GENERIC_ARRAYCOPY;
  import static org.graalvm.compiler.hotspot.HotSpotBackend.IC_MISS_HANDLER;
  import static org.graalvm.compiler.hotspot.HotSpotBackend.INITIALIZE_KLASS_BY_SYMBOL;
  import static org.graalvm.compiler.hotspot.HotSpotBackend.INVOCATION_EVENT;
  import static org.graalvm.compiler.hotspot.HotSpotBackend.MONTGOMERY_MULTIPLY;
  import static org.graalvm.compiler.hotspot.HotSpotBackend.MONTGOMERY_SQUARE;
*** 83,93 ****
  import static org.graalvm.compiler.hotspot.stubs.ExceptionHandlerStub.EXCEPTION_HANDLER_FOR_PC;
  import static org.graalvm.compiler.hotspot.stubs.NewArrayStub.NEW_ARRAY_C;
  import static org.graalvm.compiler.hotspot.stubs.NewInstanceStub.NEW_INSTANCE_C;
  import static org.graalvm.compiler.hotspot.stubs.StubUtil.VM_MESSAGE_C;
  import static org.graalvm.compiler.hotspot.stubs.UnwindExceptionToCallerStub.EXCEPTION_HANDLER_FOR_RETURN_ADDRESS;
- import static org.graalvm.compiler.nodes.NamedLocationIdentity.any;
  import static org.graalvm.compiler.nodes.java.ForeignCallDescriptors.REGISTER_FINALIZER;
  import static org.graalvm.compiler.replacements.Log.LOG_OBJECT;
  import static org.graalvm.compiler.replacements.Log.LOG_PRIMITIVE;
  import static org.graalvm.compiler.replacements.Log.LOG_PRINTF;
  import static org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode.BinaryOperation.POW;
--- 84,93 ----
*** 95,104 ****
--- 95,105 ----
  import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.EXP;
  import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.LOG;
  import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.LOG10;
  import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.SIN;
  import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.TAN;
+ import static org.graalvm.word.LocationIdentity.any;
  
  import java.util.EnumMap;
  
  import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
  import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
*** 211,221 ****
          // c_rarg2 - element count, treated as ssize_t, can be zero
          // c_rarg3 - size_t ckoff (super_check_offset)
          // c_rarg4 - oop ckval (super_klass)
          // return: 0 = success, n = number of copied elements xor'd with -1.
          ForeignCallDescriptor desc = new ForeignCallDescriptor(name, int.class, Word.class, Word.class, Word.class, Word.class, Word.class);
!         LocationIdentity killed = NamedLocationIdentity.getArrayLocation(JavaKind.Object);
          registerForeignCall(desc, routine, NativeCall, DESTROYS_REGISTERS, LEAF_NOFP, NOT_REEXECUTABLE, killed);
          checkcastArraycopyDescriptors[uninit ? 1 : 0] = desc;
      }
  
      private void registerArrayCopy(JavaKind kind, long routine, long alignedRoutine, long disjointRoutine, long alignedDisjointRoutine) {
--- 212,222 ----
          // c_rarg2 - element count, treated as ssize_t, can be zero
          // c_rarg3 - size_t ckoff (super_check_offset)
          // c_rarg4 - oop ckval (super_klass)
          // return: 0 = success, n = number of copied elements xor'd with -1.
          ForeignCallDescriptor desc = new ForeignCallDescriptor(name, int.class, Word.class, Word.class, Word.class, Word.class, Word.class);
!         LocationIdentity killed = NamedLocationIdentity.any();
          registerForeignCall(desc, routine, NativeCall, DESTROYS_REGISTERS, LEAF_NOFP, NOT_REEXECUTABLE, killed);
          checkcastArraycopyDescriptors[uninit ? 1 : 0] = desc;
      }
  
      private void registerArrayCopy(JavaKind kind, long routine, long alignedRoutine, long disjointRoutine, long alignedDisjointRoutine) {
*** 331,340 ****
--- 332,342 ----
          registerArrayCopy(JavaKind.Object, c.oopArraycopyUninit, c.oopAlignedArraycopyUninit, c.oopDisjointArraycopyUninit, c.oopAlignedDisjointArraycopyUninit, true);
  
          registerCheckcastArraycopyDescriptor(true, c.checkcastArraycopyUninit);
          registerCheckcastArraycopyDescriptor(false, c.checkcastArraycopy);
  
+         registerForeignCall(GENERIC_ARRAYCOPY, c.genericArraycopy, NativeCall, DESTROYS_REGISTERS, LEAF_NOFP, NOT_REEXECUTABLE, NamedLocationIdentity.any());
          registerForeignCall(UNSAFE_ARRAYCOPY, c.unsafeArraycopy, NativeCall, DESTROYS_REGISTERS, LEAF_NOFP, NOT_REEXECUTABLE, NamedLocationIdentity.any());
  
          if (c.useMultiplyToLenIntrinsic()) {
              registerForeignCall(MULTIPLY_TO_LEN, c.multiplyToLen, NativeCall, DESTROYS_REGISTERS, LEAF_NOFP, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Int));
          }