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

dwarf/line: handle DW_LNE_end_of_sequence correctly

Browse Source 
We need to reset the current file and line number.

Fixes #1008
This commit is contained in:
aarzilli 2017-12-04 11:03:17 +01:00 committed by Alessandro Arzilli
parent 2e74b9c4aa
commit b3246296d7
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/dwarf/line/state_machine.go
View File

@ -272,6 +272,14 @@ func (sm *StateMachine) next() error {
if sm.valid {
sm.lastAddress, sm.lastFile, sm.lastLine = sm.address, sm.file, sm.line
}
if sm.endSeq {
sm.endSeq = false
sm.file = sm.dbl.FileNames[0].Path
sm.line = 1
sm.column = 0
sm.isStmt = false
sm.basicBlock = false
}
b, err := sm.buf.ReadByte()
if err != nil {
return err

19
pkg/proc/proc_test.go
View File

@ -3355,3 +3355,22 @@ func TestIssue1034(t *testing.T) {
}
})
}
func TestIssue1008(t *testing.T) {
// The external linker on macOS inserts "end of sequence" extended opcodes
// in debug_line. which we should support correctly.
withTestProcess("cgostacktest/", t, func(p proc.Process, fixture protest.Fixture) {
_, err := setFunctionBreakpoint(p, "main.main")
assertNoError(err, t, "setFunctionBreakpoint()")
assertNoError(proc.Continue(p), t, "Continue()")
loc, err := p.CurrentThread().Location()
assertNoError(err, t, "CurrentThread().Location()")
t.Logf("location %v\n", loc)
if !strings.HasSuffix(loc.File, "/main.go") {
t.Errorf("unexpected location %s:%d\n", loc.File, loc.Line)
}
if loc.Line > 31 {
t.Errorf("unexpected location %s:%d (file only has 30 lines)\n", loc.File, loc.Line)
}
})
}