*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/AESCryptSubstitutions.java	Mon Mar 20 17:38:52 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/AESCryptSubstitutions.java	Mon Mar 20 17:38:52 2017

*** 40,50 ****
--- 40,50 ----
  import org.graalvm.compiler.graph.Node.NodeIntrinsic;
  import org.graalvm.compiler.hotspot.nodes.ComputeObjectAddressNode;
  import org.graalvm.compiler.nodes.DeoptimizeNode;
  import org.graalvm.compiler.nodes.PiNode;
  import org.graalvm.compiler.nodes.extended.ForeignCallNode;
! import org.graalvm.compiler.nodes.extended.UnsafeLoadNode;
! import org.graalvm.compiler.nodes.extended.RawLoadNode;
  import org.graalvm.compiler.word.Pointer;
  import org.graalvm.compiler.word.Word;
  
  import jdk.vm.ci.meta.DeoptimizationAction;
  import jdk.vm.ci.meta.DeoptimizationReason;

*** 118,136 ****
--- 118,136 ----
      }
  
      private static void crypt(Object rcvr, byte[] in, int inOffset, byte[] out, int outOffset, boolean encrypt, boolean withOriginalKey) {
          checkArgs(in, inOffset, out, outOffset);
          Object realReceiver = PiNode.piCastNonNull(rcvr, AESCryptClass);
!         Object kObject = UnsafeLoadNode.load(realReceiver, kOffset, JavaKind.Object, LocationIdentity.any());
!         Object kObject = RawLoadNode.load(realReceiver, kOffset, JavaKind.Object, LocationIdentity.any());
          Pointer kAddr = Word.objectToTrackedPointer(kObject).add(getArrayBaseOffset(JavaKind.Int));
          Word inAddr = Word.unsigned(ComputeObjectAddressNode.get(in, getArrayBaseOffset(JavaKind.Byte) + inOffset));
          Word outAddr = Word.unsigned(ComputeObjectAddressNode.get(out, getArrayBaseOffset(JavaKind.Byte) + outOffset));
          if (encrypt) {
              encryptBlockStub(ENCRYPT_BLOCK, inAddr, outAddr, kAddr);
          } else {
              if (withOriginalKey) {
!                 Object lastKeyObject = UnsafeLoadNode.load(realReceiver, lastKeyOffset, JavaKind.Object, LocationIdentity.any());
!                 Object lastKeyObject = RawLoadNode.load(realReceiver, lastKeyOffset, JavaKind.Object, LocationIdentity.any());
                  Pointer lastKeyAddr = Word.objectToTrackedPointer(lastKeyObject).add(getArrayBaseOffset(JavaKind.Byte));
                  decryptBlockWithOriginalKeyStub(DECRYPT_BLOCK_WITH_ORIGINAL_KEY, inAddr, outAddr, kAddr, lastKeyAddr);
              } else {
                  decryptBlockStub(DECRYPT_BLOCK, inAddr, outAddr, kAddr);
              }