qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-17 06:24:48 -07:00
Code Releases Activity

debug/gosym: add hook to disable recovers

Browse Source 
debug/gosym assumes throughout that bogus input means a malformed file.
That's generally true, but not when you're changing the package.
In that case, the panic usually indicates a newly introduced bug,
and seeing the panic is really useful.

Add a manually-enabled way to make panics panic.

Change-Id: I07af6c7b982c4cf61180db29f07aa63576ba7837
Reviewed-on: https://go-review.googlesource.com/c/go/+/352949
Trust: Josh Bleecher Snyder <josharian@gmail.com>
Run-TryBot: Josh Bleecher Snyder <josharian@gmail.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Cherry Mui <cherryyz@google.com>
This commit is contained in:
Josh Bleecher Snyder 2021-09-28 13:13:49 -07:00
parent c2de759581
commit 2fad7dbb89
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/debug/gosym/pclntab.go
View File

@ -193,10 +193,12 @@ func (t *LineTable) parsePclnTab() {
// Error paths through this code will default the version to 1.1. // Error paths through this code will default the version to 1.1.
t.version = ver11 t.version = ver11
defer func() { if !disableRecover {
// If we panic parsing, assume it's a Go 1.1 pclntab. defer func() {
recover() // If we panic parsing, assume it's a Go 1.1 pclntab.
}() recover()
}()
}
// Check header: 4-byte magic, two zeros, pc quantum, pointer size. // Check header: 4-byte magic, two zeros, pc quantum, pointer size.
if len(t.Data) < 16 || t.Data[4] != 0 || t.Data[5] != 0 || if len(t.Data) < 16 || t.Data[4] != 0 || t.Data[5] != 0 ||
@ -265,9 +267,11 @@ func (t *LineTable) parsePclnTab() {
// go12Funcs returns a slice of Funcs derived from the Go 1.2 pcln table. // go12Funcs returns a slice of Funcs derived from the Go 1.2 pcln table.
func (t *LineTable) go12Funcs() []Func { func (t *LineTable) go12Funcs() []Func {
// Assume it is malformed and return nil on error. // Assume it is malformed and return nil on error.
defer func() { if !disableRecover {
recover() defer func() {
}() recover()
}()
}
n := len(t.functab) / int(t.ptrsize) / 2 n := len(t.functab) / int(t.ptrsize) / 2
funcs := make([]Func, n) funcs := make([]Func, n)
@ -441,7 +445,7 @@ func (t *LineTable) findFileLine(entry uint64, filetab, linetab uint32, filenum,
// go12PCToLine maps program counter to line number for the Go 1.2 pcln table. // go12PCToLine maps program counter to line number for the Go 1.2 pcln table.
func (t *LineTable) go12PCToLine(pc uint64) (line int) { func (t *LineTable) go12PCToLine(pc uint64) (line int) {
defer func() { defer func() {
if recover() != nil { if !disableRecover && recover() != nil {
line = -1 line = -1
} }
}() }()
@ -458,7 +462,7 @@ func (t *LineTable) go12PCToLine(pc uint64) (line int) {
// go12PCToFile maps program counter to file name for the Go 1.2 pcln table. // go12PCToFile maps program counter to file name for the Go 1.2 pcln table.
func (t *LineTable) go12PCToFile(pc uint64) (file string) { func (t *LineTable) go12PCToFile(pc uint64) (file string) {
defer func() { defer func() {
if recover() != nil { if !disableRecover && recover() != nil {
file = "" file = ""
} }
}() }()
@ -490,7 +494,7 @@ func (t *LineTable) go12PCToFile(pc uint64) (file string) {
// go12LineToPC maps a (file, line) pair to a program counter for the Go 1.2/1.16 pcln table. // go12LineToPC maps a (file, line) pair to a program counter for the Go 1.2/1.16 pcln table.
func (t *LineTable) go12LineToPC(file string, line int) (pc uint64) { func (t *LineTable) go12LineToPC(file string, line int) (pc uint64) {
defer func() { defer func() {
if recover() != nil { if !disableRecover && recover() != nil {
pc = 0 pc = 0
} }
}() }()
@ -552,12 +556,18 @@ func (t *LineTable) initFileMap() {
// Every key maps to obj. That's not a very interesting map, but it provides // Every key maps to obj. That's not a very interesting map, but it provides
// a way for callers to obtain the list of files in the program. // a way for callers to obtain the list of files in the program.
func (t *LineTable) go12MapFiles(m map[string]*Obj, obj *Obj) { func (t *LineTable) go12MapFiles(m map[string]*Obj, obj *Obj) {
defer func() { if !disableRecover {
recover() defer func() {
}() recover()
}()
}
t.initFileMap() t.initFileMap()
for file := range t.fileMap { for file := range t.fileMap {
m[file] = obj m[file] = obj
} }
} }
// disableRecover causes this package not to swallow panics.
// This is useful when making changes.
const disableRecover = false