[GR-54853] [GR-60663] Fix compilation bailouts when the debugger is enabled.

PullRequest: graal/19636

Author: gilles-duboscq

espresso/mx.espresso/mx_espresso.py

@@ -130,7 +130,7 @@ def _run_espresso(args=None, cwd=None, nonZeroIsFatal=True, out=None, err=None,
 
 def _run_espresso_meta(args, nonZeroIsFatal=True, timeout=None):
     """Run Espresso (standalone) on Espresso (launcher)"""
-    return _run_espresso_launcher([
+    return _run_espresso([
         '--vm.Xss4m',
     ] + _espresso_standalone_command(args, allow_jacoco=False), nonZeroIsFatal=nonZeroIsFatal, timeout=timeout)
 

espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/api/ErrorCodes.java

@@ -50,6 +50,7 @@ public final class ErrorCodes {
     public static final int ABSENT_INFORMATION = 101;
     public static final int INVALID_EVENT_TYPE = 102;
     public static final int INTERNAL = 113;
+    public static final int INVALID_INDEX = 503;
     public static final int INVALID_LENGTH = 504;
     public static final int INVALID_STRING = 506;
     public static final int INVALID_CLASS_LOADER = 507;

espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/JDWP.java

@@ -2111,8 +2111,7 @@ static CommandResult createReply(Packet packet, DebuggerController controller) {
                 }
 
                 int startFrame = input.readInt();
-                int length = input.readInt();
-                final int requestedLength = length;
+                int requestedLength = input.readInt();
 
                 controller.fine(() -> "requesting frames for thread: " + controller.getContext().getThreadName(thread));
                 controller.fine(() -> "startFrame requested: " + startFrame);
@@ -2127,13 +2126,21 @@ static CommandResult createReply(Packet packet, DebuggerController controller) {
                 }
 
                 CallFrame[] frames = suspendedInfo.getStackFrames();
-
-                if (length == -1 || length > frames.length) {
-                    length = frames.length;
+                if (startFrame < 0 || startFrame >= frames.length) {
+                    reply.errorCode(ErrorCodes.INVALID_INDEX);
+                    return new CommandResult(reply);
+                }
+                int length;
+                if (requestedLength == -1) {
+                    length = frames.length - startFrame;
+                } else if (requestedLength < 0 || startFrame + requestedLength > frames.length) {
+                    reply.errorCode(ErrorCodes.INVALID_LENGTH);
+                    return new CommandResult(reply);
+                } else {
+                    length = requestedLength;
                 }
                 reply.writeInt(length);
-                final int finalLength = length;
-                controller.fine(() -> "returning " + finalLength + " frames for thread: " + controller.getContext().getThreadName(thread));
+                controller.fine(() -> "returning " + length + " frames for thread: " + controller.getContext().getThreadName(thread));
 
                 for (int i = startFrame; i < startFrame + length; i++) {
                     CallFrame frame = frames[i];

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/bytecode/MapperBCI.java

@@ -102,6 +102,17 @@ private int lookup(int targetBCI) {
         throw EspressoError.shouldNotReachHere();
     }
 
+    /**
+     * Lookup the index of the largest element which is smaller or equal to {@code targetBCI}.
+     */
+    public int lookupBucket(int targetBCI) {
+        int res = slowLookup(targetBCI, 0, length);
+        if (res >= 0) {
+            return res;
+        }
+        return -res - 1;
+    }
+
     public int lookup(int curIndex, int curBCI, int targetBCI) {
         int res;
         int start;
@@ -117,7 +128,7 @@ public int lookup(int curIndex, int curBCI, int targetBCI) {
         if (res >= 0) {
             return res;
         }
-        return -res - 2;
+        return -res - 1;
     }
 
     public int checkNext(int curIndex, int targetBCI) {
@@ -128,20 +139,20 @@ public int checkNext(int curIndex, int targetBCI) {
     }
 
     /**
-     * inlined binary search. No bounds checks.
+     * Inlined binary search. No bounds checks.
      * 
      * @see Arrays#binarySearch(int[], int, int, int)
+     * @return either the index of the element that is equal to {@code targetBCI} or a negative
+     *         number {@code -(i + 1)} where i is the index of the largest element which is smaller
+     *         than {@code targetBCI}.
      */
     @ExplodeLoop(kind = ExplodeLoop.LoopExplosionKind.FULL_EXPLODE)
     private int slowLookup(int targetBCI, int start, int end) {
-        // Our usage should not see an out of bounds
         int low = start;
         int high = end - 1;
-
         while (low <= high) {
             int mid = (low + high) >>> 1;
             int midVal = bcis[mid];
-
             if (midVal < targetBCI) {
                 low = mid + 1;
             } else if (midVal > targetBCI) {
@@ -150,7 +161,7 @@ private int slowLookup(int targetBCI, int start, int end) {
                 return mid;
             }
         }
-        return -(low + 1);  // key not found.
+        return -low;
     }
 
 }