# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1435595927 -7200
# Node ID 62dc08c8b68726436cc8789e0f41e6d32c214dff
# Parent  6b5221d7b5c1197ce67a2c74ed263515c5b747a3
fixed bug in bounds check for crypto intrinsics

diff -r 6b5221d7b5c1 -r 62dc08c8b687 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/AESCryptSubstitutions.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/AESCryptSubstitutions.java	Mon Jun 29 17:24:09 2015 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/AESCryptSubstitutions.java	Mon Jun 29 18:38:47 2015 +0200
@@ -26,7 +26,6 @@
 import static com.oracle.graal.hotspot.replacements.HotSpotReplacementsUtil.*;
 import static com.oracle.graal.nodes.extended.BranchProbabilityNode.*;
 import static com.oracle.graal.word.Word.*;
-import static jdk.internal.jvmci.code.UnsignedMath.*;
 
 import java.lang.reflect.*;
 
@@ -93,7 +92,7 @@
      * Perform null and array bounds checks for arguments to a cipher operation.
      */
     static void checkArgs(byte[] in, int inOffset, byte[] out, int outOffset) {
-        if (probability(VERY_SLOW_PATH_PROBABILITY, aboveThan(inOffset + AES_BLOCK_SIZE, in.length) || aboveThan(outOffset + AES_BLOCK_SIZE, out.length))) {
+        if (probability(VERY_SLOW_PATH_PROBABILITY, inOffset < 0 || in.length - AES_BLOCK_SIZE < inOffset || outOffset < 0 || out.length - AES_BLOCK_SIZE < outOffset)) {
             DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint);
         }
     }