Skip to content
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.

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

Jump to bottom

18391-Debugger must guard against actions on process termination #409

Merged
merged 1 commit into from Oct 31, 2017
Merged

18391-Debugger must guard against actions on process termination #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/DebuggerModel.package/DebugSession.class/instance/pcRangeForContext..st
View file
Open in desktop
Expand Up @@ -2,9 +2,11 @@ context
pcRangeForContext: aContext
"Answer the indices in the source code for the method corresponding to
aContext's program counter value."

aContext isDead ifTrue:
(aContext isNil) ifTrue: [
self terminate.
] ifFalse: [
(aContext isDead) ifTrue:
[^1 to: 0].
^aContext debuggerMap
rangeForPC: aContext pc
contextIsActiveContext: (self isLatestContext: aContext)
contextIsActiveContext: (self isLatestContext: aContext) ]
6 changes: 5 additions & 1 deletion src/GT-Debugger.package/GTMoldableDebugger.class/instance/updateBrowser.st
View file
Open in desktop
Expand Up @@ -3,6 +3,10 @@ updateBrowser
| browserPane session |

session := self session.
session interruptedContext ifNil: [
self close.
UIManager default inform: 'End of debugged execution'.
] ifNotNil: [
browserPane := self browser pane.
(browserPane port: #entity) silentValue: nil.
(browserPane port: #entity) value: session.
(browserPane port: #entity) value: session. ]
2 changes: 1 addition & 1 deletion src/Kernel.package/Context.class/instance/runUntilErrorOrReturnFrom..st
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@ runUntilErrorOrReturnFrom: aSender
"Control resumes here once above ensure block or exception handler is executed"
^ error ifNil: [
"No error was raised, remove ensure context by stepping until popped"
[context isDead] whileFalse: [topContext := topContext stepToCallee].
[(context isDead)or: [ topContext isNil ]] whileFalse: [topContext := topContext stepToCallee].
{topContext. nil}

] ifNotNil: [
Expand Down
1 change: 0 additions & 1 deletion src/Kernel.package/Process.class/instance/terminate.st
View file
Open in desktop
Expand Up @@ -6,7 +6,6 @@ terminate
terminating := self isTerminating
ifTrue: [ ^ ProcessAlreadyTerminating signal ]
ifFalse: [ true ].

self isActiveProcess
ifTrue: [
ctxt := thisContext.
Expand Down