Skip to content

Commit 40d1c30

Browse files
committed
[GR-13225] Add missing TruffleBoundary when looking for Debugger
PullRequest: graalpython/394
2 parents 72f09bc + 94b9f1f commit 40d1c30

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

ci.jsonnet

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888

8989
local darwinMixin = {
9090
capabilities +: ["darwin_sierra", "amd64"],
91+
timelimit: TIME_LIMIT["1h"],
9192
packages +: {
9293
"pip:astroid": "==1.1.0",
9394
"pip:pylint": "==1.1.0",

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1513,7 +1513,7 @@ public abstract static class BreakPointNode extends PythonBuiltinNode {
15131513

15141514
@Specialization
15151515
public Object doIt(VirtualFrame frame, Object[] args, PKeyword[] kwargs) {
1516-
if (Debugger.find(getContext().getEnv()).getSessionCount() > 0) {
1516+
if (getDebuggerSessionCount() > 0) {
15171517
// we already have a Truffle debugger attached, it'll stop here
15181518
return PNone.NONE;
15191519
} else {
@@ -1532,6 +1532,11 @@ public Object doIt(VirtualFrame frame, Object[] args, PKeyword[] kwargs) {
15321532
return callNode.execute(frame, breakpointhook, args, kwargs);
15331533
}
15341534
}
1535+
1536+
@TruffleBoundary
1537+
private int getDebuggerSessionCount() {
1538+
return Debugger.find(getContext().getEnv()).getSessionCount();
1539+
}
15351540
}
15361541

15371542
@Builtin(name = "__tdebug__", takesVarArgs = true)

mx.graalpython/suite.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@
4343
},
4444
{
4545
"name": "sulong",
46-
"version": "526f76f44f59943be852c07e6999d08401b40962",
46+
"version": "175738c97f96974ba44251e913a597aa64a7d3c2",
4747
"subdir": True,
4848
"urls": [
4949
{"url": "https://github.com/oracle/graal", "kind": "git"},
5050
]
5151
},
5252
{
5353
"name": "regex",
54-
"version": "526f76f44f59943be852c07e6999d08401b40962",
54+
"version": "175738c97f96974ba44251e913a597aa64a7d3c2",
5555
"subdir": True,
5656
"urls": [
5757
{"url": "https://github.com/oracle/graal", "kind": "git"},

0 commit comments

Comments
 (0)