From 5c301dd9b189ebf0923c23898c69b6d81c68c331 Mon Sep 17 00:00:00 2001 From: Derek Parker Date: Tue, 7 Oct 2014 07:57:11 -0500 Subject: [PATCH] Improve 'in current fn' check for Next impl --- proctl/proctl_linux_amd64.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/proctl/proctl_linux_amd64.go b/proctl/proctl_linux_amd64.go index dc05c109..0d915734 100644 --- a/proctl/proctl_linux_amd64.go +++ b/proctl/proctl_linux_amd64.go @@ -279,7 +279,7 @@ func (dbp *DebuggedProcess) Next() error { pc-- } - f, l, _ := dbp.GoSymTable.PCToLine(pc) + _, l, fn := dbp.GoSymTable.PCToLine(pc) fde, err := dbp.FrameEntries.FDEForPC(pc) if err != nil { return err @@ -314,11 +314,9 @@ func (dbp *DebuggedProcess) Next() error { return err } - nf, nl, _ := dbp.GoSymTable.PCToLine(pc) - if nf == f && nl != l { - if fde.AddressRange.Cover(pc) { - break - } + _, nl, nfn := dbp.GoSymTable.PCToLine(pc) + if nfn == fn && nl != l { + break } }