golang/delve
1
0
Fork 0
mirror of https://github.com/go-delve/delve.git synced 2025-10-30 02:07:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

dwarf/line: handle end_seq properly (#3277)

Browse Source 
This patch changes how we handle end_seq in the debug_line state machine
program. Instead of always considering the state machine invalid at the
end_seq instead simply consider the *current* address invalid. This
solves a number of issues such as incorrect disassemble output for the
last few instructions in certain functions, and creating an eval scope
at an address within the last few instructions of certain functions. It
also handles the case where the end_seq address is the same as the start
address of the next adjacent function, which would previously confuse
Delve which is why we initially marked end_seq as invalid for the entire
state machine. This approach is more nuanced and still solves that
initial problem while fixing some problems introduced by that patch.
This commit is contained in:
Derek Parker
2023-02-20 11:36:09 +02:00
committed by GitHub
parent cf65f94776
commit cac86b8791
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,6 +108,7 @@ func newStateMachine(dbl *DebugLineInfo, instructions []byte, ptrSize int) *Stat
if len(dbl.FileNames) > 0 { if len(dbl.FileNames) > 0 {
file = dbl.FileNames[0].Path file = dbl.FileNames[0].Path
} }
dbl.endSeqIsValid = true
sm := &StateMachine{ sm := &StateMachine{
dbl: dbl, dbl: dbl,
file: file, file: file,
@ -261,7 +262,7 @@ func (sm *StateMachine) PCToLine(pc uint64) (string, int, bool) {
if (sm.address > pc) && (pc >= sm.lastAddress) { if (sm.address > pc) && (pc >= sm.lastAddress) {
return sm.lastFile, sm.lastLine, true return sm.lastFile, sm.lastLine, true
} }
if sm.address == pc { if sm.address == pc && !sm.endSeq {
return sm.file, sm.line, true return sm.file, sm.line, true
} }
} }
@ -272,7 +273,7 @@ func (sm *StateMachine) PCToLine(pc uint64) (string, int, bool) {
break break
} }
} }
if sm.valid { if sm.valid && !sm.endSeq {
return sm.file, sm.line, true return sm.file, sm.line, true
} }
return "", 0, false return "", 0, false
@ -301,7 +302,7 @@ func (lineInfo *DebugLineInfo) LineToPCs(filename string, lineno int) []PCStmt {
} }
break break
} }
if sm.line == lineno && sm.file == filename && sm.valid { if sm.line == lineno && sm.file == filename && sm.valid && !sm.endSeq {
pcstmts = append(pcstmts, PCStmt{sm.address, sm.isStmt}) pcstmts = append(pcstmts, PCStmt{sm.address, sm.isStmt})
} }
} }

2
pkg/proc/eval.go
View File

@ -474,7 +474,7 @@ func (scope *EvalScope) LocalVariables(cfg LoadConfig) ([]*Variable, error) {
// FunctionArguments returns the name, value, and type of all current function arguments. // FunctionArguments returns the name, value, and type of all current function arguments.
func (scope *EvalScope) FunctionArguments(cfg LoadConfig) ([]*Variable, error) { func (scope *EvalScope) FunctionArguments(cfg LoadConfig) ([]*Variable, error) {
vars, err := scope.Locals(localsNoDeclLineCheck) vars, err := scope.Locals(0)
if err != nil { if err != nil {
return nil, err return nil, err
} }