golang/delve
1
0
Fork 0
mirror of https://github.com/go-delve/delve.git synced 2025-10-29 17:56:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

pkg,service: Use PCToFunc instead of PCToLine if it only needs func (#1894)

Browse Source
This commit is contained in:
chainhelen
2020-02-25 23:01:37 -06:00
committed by GitHub
parent 23b8e59ab9
commit 7560c33819
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/proc/arm64_arch.go
View File

@ -213,7 +213,7 @@ func (a *ARM64) SwitchStack(it *stackIterator, callFrameRegs *op.DwarfRegisters)
} }
} }
_, _, fn := it.bi.PCToLine(it.frame.Ret) fn := it.bi.PCToFunc(it.frame.Ret)
if fn == nil { if fn == nil {
return false return false
} }

2
pkg/proc/proc_test.go
View File

@ -4027,7 +4027,7 @@ func TestReadDefer(t *testing.T) {
if d.Unreadable != nil { if d.Unreadable != nil {
t.Fatalf("expected %q as %s of frame %d, got unreadable defer: %v", tgt, deferName, frameIdx, d.Unreadable) t.Fatalf("expected %q as %s of frame %d, got unreadable defer: %v", tgt, deferName, frameIdx, d.Unreadable)
} }
_, _, dfn := p.BinInfo().PCToLine(d.DeferredPC) dfn := p.BinInfo().PCToFunc(d.DeferredPC)
if dfn == nil { if dfn == nil {
t.Fatalf("expected %q as %s of frame %d, got %#x", tgt, deferName, frameIdx, d.DeferredPC) t.Fatalf("expected %q as %s of frame %d, got %#x", tgt, deferName, frameIdx, d.DeferredPC)
} }

2
service/debugger/debugger.go
View File

@ -1287,7 +1287,7 @@ func (d *Debugger) Disassemble(goroutineID int, addr1, addr2 uint64, flavour api
} }
if addr2 == 0 { if addr2 == 0 {
_, _, fn := d.target.BinInfo().PCToLine(addr1) fn := d.target.BinInfo().PCToFunc(addr1)
if fn == nil { if fn == nil {
return nil, fmt.Errorf("address %#x does not belong to any function", addr1) return nil, fmt.Errorf("address %#x does not belong to any function", addr1)
} }

2
service/debugger/locations.go
View File

@ -287,7 +287,7 @@ func (loc *AddrLocationSpec) Find(d *Debugger, scope *proc.EvalScope, locStr str
addr, _ := constant.Uint64Val(v.Value) addr, _ := constant.Uint64Val(v.Value)
return []api.Location{{PC: addr}}, nil return []api.Location{{PC: addr}}, nil
case reflect.Func: case reflect.Func:
_, _, fn := d.target.BinInfo().PCToLine(uint64(v.Base)) fn := d.target.BinInfo().PCToFunc(uint64(v.Base))
pc, err := proc.FirstPCAfterPrologue(d.target, fn, false) pc, err := proc.FirstPCAfterPrologue(d.target, fn, false)
if err != nil { if err != nil {
return nil, err return nil, err