Automatic merge of master into galahad

Author: OracleLabsAutomation

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

@@ -399,11 +399,12 @@ public interface JDWPContext {
     /**
      * Returns the bci of the next bytecode instruction within the current frame
      *
-     * @param callerRoot the root node of the caller frame
+     * @param method the current method
+     * @param rawNode the current node
      * @param frame the frame to read the current bci from
      * @return the bci of the next instruction
      */
-    int getNextBCI(RootNode callerRoot, Frame frame);
+    int getNextBCI(MethodRef method, Node rawNode, Frame frame);
 
     /**
      * Returns the current BCI or -1 if the BCI cannot be read.
@@ -412,7 +413,7 @@ public interface JDWPContext {
      * @param frame the frame to read the bci from
      * @return the BCI or -1
      */
-    long readBCIFromFrame(RootNode root, Frame frame);
+    int readBCIFromFrame(RootNode root, Frame frame);
 
     /**
      * Returns a {@link CallFrame} representation of the location of
@@ -478,7 +479,7 @@ public interface JDWPContext {
      * @param frame the current frame
      * @return the current bci
      */
-    long getBCI(Node rawNode, Frame frame);
+    int getBCI(Node rawNode, Frame frame);
 
     /**
      * Returns the instrumentable delegate node for the language root node or <code>rootNode</code>

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

@@ -231,7 +231,7 @@ public interface MethodRef {
      *
      * @return last bci
      */
-    long getLastBCI();
+    int getLastBCI();
 
     /**
      * Determines if the method is a constructor.

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

@@ -38,7 +38,6 @@
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.espresso.jdwp.impl.BreakpointInfo;
 import com.oracle.truffle.espresso.jdwp.impl.ClassPrepareRequest;
-import com.oracle.truffle.espresso.jdwp.impl.DebuggerCommand;
 import com.oracle.truffle.espresso.jdwp.impl.DebuggerController;
 import com.oracle.truffle.espresso.jdwp.impl.FieldBreakpointEvent;
 import com.oracle.truffle.espresso.jdwp.impl.FieldBreakpointInfo;
@@ -532,13 +531,6 @@ public void stepCompleted(SteppingInfo info, CallFrame currentFrame) {
             stream.writeLong(currentFrame.getClassId());
             stream.writeLong(currentFrame.getMethodId());
             long codeIndex = currentFrame.getCodeIndex();
-            if (info.getStepKind() == DebuggerCommand.Kind.STEP_OUT) {
-                // Step out in Truffle is implemented on the callee exit, where the event's top
-                // stack frame is set to the caller frame. Hence, to avoid sending the code index
-                // from the caller location, we must fetch the next bci from the frame to pass the
-                // correct location.
-                codeIndex = context.getNextBCI(currentFrame.getRootNode(), currentFrame.getFrame());
-            }
             stream.writeLong(codeIndex);
             debuggerController.fine(() -> "Sending step completed event");
 

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

@@ -128,7 +128,7 @@ public void initialize(Debugger debug, JDWPOptions jdwpOptions, JDWPContext jdwp
         ids.injectLogger(jdwpLogger);
 
         // set up the debug session object early to make sure instrumentable nodes are materialized
-        debuggerSession = debug.startSession(new SuspendedCallbackImpl(), SourceElement.ROOT, SourceElement.STATEMENT);
+        debuggerSession = debug.startSession(new SuspendedCallbackImpl(), SourceElement.STATEMENT);
         debuggerSession.setSteppingFilter(SuspensionFilter.newBuilder().ignoreLanguageContextInitialization(true).build());
 
         init(jdwpContext);
@@ -963,8 +963,8 @@ public void onSuspend(SuspendedEvent event) {
                     return;
                 }
             }
-            boolean isStepOut = steppingInfo != null && event.isStep() && steppingInfo.getStepKind() == DebuggerCommand.Kind.STEP_OUT;
-            CallFrame[] callFrames = createCallFrames(ids.getIdAsLong(currentThread), event.getStackFrames(), -1, isStepOut);
+            boolean isAfter = event.getSuspendAnchor() == SuspendAnchor.AFTER;
+            CallFrame[] callFrames = createCallFrames(ids.getIdAsLong(currentThread), event.getStackFrames(), -1, isAfter);
             RootNode callerRootNode = callFrames.length > 1 ? callFrames[1].getRootNode() : null;
 
             SuspendedInfo suspendedInfo = new SuspendedInfo(context, event, callFrames, currentThread, callerRootNode);
@@ -1185,7 +1185,7 @@ private void continueStepping(SuspendedEvent event, SteppingInfo steppingInfo) {
             }
         }
 
-        private CallFrame[] createCallFrames(long threadId, Iterable<DebugStackFrame> stackFrames, int frameLimit, boolean isStepOut) {
+        private CallFrame[] createCallFrames(long threadId, Iterable<DebugStackFrame> stackFrames, int frameLimit, boolean isAfter) {
             LinkedList<CallFrame> list = new LinkedList<>();
             int frameCount = 0;
             for (DebugStackFrame frame : stackFrames) {
@@ -1212,15 +1212,16 @@ private CallFrame[] createCallFrames(long threadId, Iterable<DebugStackFrame> st
 
                 Frame rawFrame = frame.getRawFrame(context.getLanguageClass(), FrameInstance.FrameAccess.READ_WRITE);
                 MethodVersionRef methodVersion = context.getMethodFromRootNode(root);
-                KlassRef klass = methodVersion.getMethod().getDeclaringKlassRef();
+                MethodRef method = methodVersion.getMethod();
+                KlassRef klass = method.getDeclaringKlassRef();
 
                 klassId = ids.getIdAsLong(klass);
-                methodId = ids.getIdAsLong(methodVersion.getMethod());
+                methodId = ids.getIdAsLong(method);
                 typeTag = TypeTag.getKind(klass);
-                if (isStepOut) {
-                    // Truffle reports step out at the callers entry to the method, so we must fetch
+                if (isAfter && frameCount == 0) {
+                    // Truffle reports anchor after this instruction, so we must fetch
                     // the BCI that follows to get the expected location within the frame.
-                    codeIndex = context.getNextBCI(root, rawFrame);
+                    codeIndex = context.getNextBCI(method, rawNode, rawFrame);
                 } else {
                     codeIndex = context.getBCI(rawNode, rawFrame);
                 }

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/impl/Method.java

@@ -1390,7 +1390,7 @@ public int getLastLine() {
     }
 
     @Override
-    public long getLastBCI() {
+    public int getLastBCI() {
         int bci = 0;
         BytecodeStream bs = new BytecodeStream(getOriginalCode());
         int end = bs.endBCI();

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/JDWPContextImpl.java

@@ -665,19 +665,21 @@ public int getCatchLocation(MethodRef method, Object guestException, int bci) {
     }
 
     @Override
-    public int getNextBCI(RootNode callerRoot, Frame frame) {
-        if (callerRoot instanceof EspressoRootNode espressoRootNode) {
-            int bci = (int) readBCIFromFrame(callerRoot, frame);
-            if (bci >= 0) {
-                BytecodeStream bs = new BytecodeStream(espressoRootNode.getMethodVersion().getOriginalCode());
-                return bs.nextBCI(bci);
+    public int getNextBCI(MethodRef method, Node rawNode, Frame frame) {
+        int bci = getBCI(rawNode, frame);
+        if (bci >= 0) {
+            BytecodeStream bs = new BytecodeStream(method.getOriginalCode());
+            int nextBci = bs.nextBCI(bci);
+            if (nextBci < bs.endBCI()) {
+                // Use the next only if it's in bounds.
+                bci = nextBci;
             }
         }
-        return -1;
+        return bci;
     }
 
     @Override
-    public long readBCIFromFrame(RootNode root, Frame frame) {
+    public int readBCIFromFrame(RootNode root, Frame frame) {
         if (root instanceof EspressoRootNode rootNode && frame != null) {
             return rootNode.readBCI(frame);
         }
@@ -803,7 +805,7 @@ private BciProvider getBciProviderNode(Node node) {
         return null;
     }
 
-    public long getBCI(Node rawNode, Frame frame) {
+    public int getBCI(Node rawNode, Frame frame) {
         BciProvider bciProvider = getBciProviderNode(rawNode);
         if (bciProvider == null) {
             return -1;