PenaDevops/delve
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

debugger: Allow disassembly even if the scope can not be converted

Browse Source 
It is sometimes impossible to convert an EvalScope immediately after
starting the program but disassembly can still proceed.
This commit is contained in:
aarzilli 2016-03-08 18:28:55 +01:00 committed by Derek Parker
parent b1011b7378
commit 59beb7b442
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
service/debugger/debugger.go
View File

@ -762,20 +762,20 @@ func (d *Debugger) Disassemble(scope api.EvalScope, startPC, endPC uint64, flavo
endPC = fn.End
}
s, err := d.process.ConvertEvalScope(scope.GoroutineID, scope.Frame)
if err != nil {
return nil, err
}
currentGoroutine := true
if scope.GoroutineID != -1 {
g, _ := s.Thread.GetG()
if g == nil || g.ID != scope.GoroutineID {
currentGoroutine = false
thread := d.process.CurrentThread
if s, err := d.process.ConvertEvalScope(scope.GoroutineID, scope.Frame); err == nil {
thread = s.Thread
if scope.GoroutineID != -1 {
g, _ := s.Thread.GetG()
if g == nil || g.ID != scope.GoroutineID {
currentGoroutine = false
}
}
}
insts, err := s.Thread.Disassemble(startPC, endPC, currentGoroutine)
insts, err := thread.Disassemble(startPC, endPC, currentGoroutine)
if err != nil {
return nil, err
}