[GR-69227] Do not skip entries in line number table, and suspend only once per line during consecutive steps.

PullRequest: graal/22035

Author: entlicher

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

@@ -899,6 +899,8 @@ private RootNode getRootNode(FrameInstance frameInstance) {
 
     private class SuspendedCallbackImpl implements SuspendedCallback {
 
+        private final ThreadLocal<SuspendedLine> lastSuspendedLine = new ThreadLocal<>();
+
         @Override
         public void onSuspend(SuspendedEvent event) {
             Thread hostThread = Thread.currentThread();
@@ -914,6 +916,7 @@ public void onSuspend(SuspendedEvent event) {
             Object currentThread = getContext().asGuestThread(hostThread);
             fine(() -> "Suspended at: " + event.getSourceSection() + " in thread: " + getThreadName(currentThread));
 
+            SuspendedLine suspendedLine = null;
             SteppingInfo steppingInfo = commandRequestIds.remove(currentThread);
             if (steppingInfo != null) {
                 if (steppingInfo.isForceEarlyReturn()) {
@@ -927,10 +930,12 @@ public void onSuspend(SuspendedEvent event) {
                 if (callFrames.length > 0) {
                     callFrame = callFrames[0];
                 }
+                suspendedLine = getSuspendedLine(callFrame);
                 EventInfo eventInfo = callFrame != null ? new EventInfo.Frame(context, callFrame, currentThread) : null;
-                if (checkExclusionFilters(steppingInfo, event, eventInfo)) {
+                if (isOnPreviousLine(suspendedLine) || checkExclusionFilters(steppingInfo, eventInfo)) {
                     fine(() -> "not suspending here: " + event.getSourceSection());
                     // continue stepping until completed
+                    continueStepping(event, steppingInfo);
                     RequestFilter requestFilter = eventFilters.getRequestFilter(steppingInfo.getRequestId());
                     if (requestFilter != null && requestFilter.isActive()) {
                         commandRequestIds.put(currentThread, steppingInfo);
@@ -975,10 +980,35 @@ public void onSuspend(SuspendedEvent event) {
             if (result.skipSuspend) {
                 return;
             }
+            if (suspendedLine == null && callFrames.length > 0) {
+                suspendedLine = getSuspendedLine(callFrames[0]);
+            }
+            lastSuspendedLine.set(suspendedLine);
             // now, suspend the current thread until resumed by e.g. a debugger command
             suspend(currentThread, result.suspendPolicy, jobs, result.breakpointHit || event.isStep() || event.isUnwind());
         }
 
+        private static SuspendedLine getSuspendedLine(CallFrame callFrame) {
+            if (callFrame == null) {
+                return null;
+            }
+            long bci = callFrame.getCodeIndex();
+            int line = callFrame.getMethod().bciToLineNumber((int) bci);
+            if (line >= 0) {
+                return new SuspendedLine(callFrame.getMethodId(), line);
+            } else {
+                return null;
+            }
+        }
+
+        private boolean isOnPreviousLine(SuspendedLine currentLine) {
+            if (currentLine != null) {
+                return currentLine.equals(lastSuspendedLine.get());
+            } else {
+                return false;
+            }
+        }
+
         private BreakpointHitResult checkForBreakpoints(SuspendedEvent event, List<Callable<Void>> jobs, SuspendedInfo suspendedInfo, Object currentThread, CallFrame[] callFrames) {
             boolean handledLineBreakpoint = false;
             boolean hit = false;
@@ -1086,10 +1116,9 @@ private BreakpointHitResult checkForBreakpoints(SuspendedEvent event, List<Calla
             return new BreakpointHitResult(hit, suspendPolicy, false);
         }
 
-        private boolean checkExclusionFilters(SteppingInfo info, SuspendedEvent event, EventInfo eventInfo) {
+        private boolean checkExclusionFilters(SteppingInfo info, EventInfo eventInfo) {
             if (info != null) {
                 if (isSingleSteppingSuspended()) {
-                    continueStepping(event, info);
                     return true;
                 }
                 if (eventInfo == null) {
@@ -1101,7 +1130,6 @@ private boolean checkExclusionFilters(SteppingInfo info, SuspendedEvent event, E
                     // we're currently stepping, so check if suspension point
                     // matches any exclusion filters
                     if (!requestFilter.isHit(eventInfo)) {
-                        continueStepping(event, info);
                         return true;
                     }
                 }
@@ -1190,6 +1218,9 @@ private static final class BreakpointHitResult {
                 this.skipSuspend = skipSuspend;
             }
         }
+
+        private static record SuspendedLine(long methodId, int line) {
+        }
     }
 
     private boolean isSingleSteppingSuspended() {

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/BytecodeNode.java

@@ -2941,32 +2941,12 @@ private static boolean assertionsEnabled() {
 
             if (table != LineNumberTableAttribute.EMPTY) {
                 List<LineNumberTableAttribute.Entry> entries = table.getEntries();
-                // don't allow multiple entries with same line, keep only the first one
-                // reduce the checks needed heavily by keeping track of max seen line number
-                int[] seenLines = new int[entries.size()];
-                Arrays.fill(seenLines, -1);
-                int maxSeenLine = -1;
-
                 EspressoStatementNode[] statements = new EspressoStatementNode[entries.size()];
                 MapperBCI mapper = new MapperBCI(table);
                 for (int i = 0; i < entries.size(); i++) {
                     LineNumberTableAttribute.Entry entry = entries.get(i);
                     int lineNumber = entry.getLineNumber();
-                    boolean seen = false;
-                    boolean checkSeen = !(maxSeenLine < lineNumber);
-                    if (checkSeen) {
-                        for (int seenLine : seenLines) {
-                            if (seenLine == lineNumber) {
-                                seen = true;
-                                break;
-                            }
-                        }
-                    }
-                    if (!seen) {
-                        statements[mapper.initIndex(i, entry.getBCI())] = new EspressoStatementNode(method.getMethod().getSource().createSection(lineNumber));
-                        seenLines[i] = lineNumber;
-                        maxSeenLine = Math.max(maxSeenLine, lineNumber);
-                    }
+                    statements[mapper.initIndex(i, entry.getBCI())] = new EspressoStatementNode(method.getMethod().getSource().createSection(lineNumber));
                 }
                 this.hookBCIToNodeIndex = mapper;
                 this.statementNodes = statements;