Skip to content

AlwaysHalt tag on call to breakpoint built-in in BytecodeDSL interp #662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OctaveLarose wants to merge 5 commits into
base: master
Choose a base branch
from
+43 −0
Open

AlwaysHalt tag on call to breakpoint built-in in BytecodeDSL interp #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
967f95d
AlwaysHalt tag on call to breakpoint built-in
OctaveLarose Mar 3, 2026
a31f4f2
moved logic to emitCall() to not break on breakpoint when not called
OctaveLarose Mar 4, 2026
4b98a7a
adding testInlineEvaluationBreakpointBuiltin
OctaveLarose Mar 4, 2026
1adc606
checking line for each breakpoint
OctaveLarose Mar 4, 2026
b573a32
eclipse formatter pass
OctaveLarose Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions .../com.oracle.graal.python.test/src/com/oracle/graal/python/test/debug/PythonDebugTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,37 @@ public void testSourceFileURI() throws Throwable {
}
}

@Test
public void testInlineEvaluationBreakpointBuiltin() throws Throwable {
final Source source = Source.newBuilder("python", """
a = 1
breakpoint()
b = 2
breakpoint # not invoking, therefore no breakpoint inserted
""", "test_inline.py").buildLiteral();

try (DebuggerSession session = tester.startSession()) {
session.install(Breakpoint.newBuilder(DebuggerTester.getSourceImpl(source)).lineIs(1).build());
session.install(Breakpoint.newBuilder(DebuggerTester.getSourceImpl(source)).lineIs(3).build());
tester.startEval(source);
expectSuspended((SuspendedEvent event) -> {
DebugStackFrame frame = event.getTopStackFrame();
assertEquals(1, frame.getSourceSection().getStartLine());
event.prepareContinue();
});
expectSuspended((SuspendedEvent event) -> {
DebugStackFrame frame = event.getTopStackFrame();
assertEquals(2, frame.getSourceSection().getStartLine());
event.prepareContinue();
});
expectSuspended((SuspendedEvent event) -> {
DebugStackFrame frame = event.getTopStackFrame();
assertEquals(3, frame.getSourceSection().getStartLine());
event.prepareContinue();
});
}
}

private void expectSuspended(SuspendedCallback callback) {
tester.expectSuspended(callback);
}
Expand Down
12 changes: 12 additions & 0 deletions ...acle.graal.python/src/com/oracle/graal/python/compiler/bytecode_dsl/RootNodeCompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
import static com.oracle.graal.python.compiler.bytecode_dsl.BytecodeDSLCompilerUtils.hasDefaultArgs;
import static com.oracle.graal.python.compiler.bytecode_dsl.BytecodeDSLCompilerUtils.hasDefaultKwargs;
import static com.oracle.graal.python.compiler.bytecode_dsl.BytecodeDSLCompilerUtils.len;
import static com.oracle.graal.python.nodes.BuiltinNames.J_BREAKPOINT;
import static com.oracle.graal.python.nodes.SpecialAttributeNames.J___CLASS__;
import static com.oracle.graal.python.nodes.SpecialAttributeNames.J___TYPE_PARAMS__;
import static com.oracle.graal.python.util.PythonUtils.codePointsToInternedTruffleString;
Expand Down Expand Up @@ -156,6 +157,7 @@
import com.oracle.truffle.api.bytecode.BytecodeParser;
import com.oracle.truffle.api.bytecode.BytecodeRootNodes;
import com.oracle.truffle.api.bytecode.serialization.BytecodeSerializer;
import com.oracle.truffle.api.debug.DebuggerTags;
import com.oracle.truffle.api.instrumentation.StandardTags.StatementTag;
import com.oracle.truffle.api.source.Source;
import com.oracle.truffle.api.strings.TruffleString;
Expand Down Expand Up @@ -2188,8 +2190,18 @@ private void emitCall(ExprTy func, ExprTy[] args, KeywordTy[] keywords) {
} else {
assert len(keywords) == 0;

boolean isBreakpoint = func instanceof ExprTy.Name && ((ExprTy.Name) func).id.equals(J_BREAKPOINT);

if (isBreakpoint) {
b.beginTag(DebuggerTags.AlwaysHalt.class);
}

func.accept(this); // callable
visitArguments(func, args, numArgs);

if (isBreakpoint) {
b.endTag(DebuggerTags.AlwaysHalt.class);
}
}
}

Expand Down
Loading