提交 558eb0d4 编写于 作者: A aarzilli 提交者: Derek Parker

proc: in Next return address could be invalid, ignore errors setting it

Updates #893
上级 5c2673a6
...@@ -250,10 +250,11 @@ func next(dbp Process, stepInto bool) error { ...@@ -250,10 +250,11 @@ func next(dbp Process, stepInto bool) error {
// this frame and on the return frame. // this frame and on the return frame.
bp.Cond = sameOrRetFrameCond bp.Cond = sameOrRetFrameCond
} }
} else {
return err
} }
// Return address could be wrong, if we are unable to set a breakpoint
// there it's ok.
} }
if bp, _, _ := curthread.Breakpoint(); bp == nil { if bp, _, _ := curthread.Breakpoint(); bp == nil {
curthread.SetCurrentBreakpoint() curthread.SetCurrentBreakpoint()
} }
......
...@@ -216,7 +216,7 @@ func TestExecuteFile(t *testing.T) { ...@@ -216,7 +216,7 @@ func TestExecuteFile(t *testing.T) {
func TestIssue354(t *testing.T) { func TestIssue354(t *testing.T) {
printStack([]api.Stackframe{}, "") printStack([]api.Stackframe{}, "")
printStack([]api.Stackframe{{api.Location{PC: 0, File: "irrelevant.go", Line: 10, Function: nil}, nil, nil, 0, nil}}, "") printStack([]api.Stackframe{{api.Location{PC: 0, File: "irrelevant.go", Line: 10, Function: nil}, nil, nil, 0, ""}}, "")
} }
func TestIssue411(t *testing.T) { func TestIssue411(t *testing.T) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册