diff options
Diffstat (limited to 'src/runtime')
| -rw-r--r-- | src/runtime/error.go | 3 | ||||
| -rw-r--r-- | src/runtime/panic.go | 13 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/runtime/error.go b/src/runtime/error.go index 16f3e53a47..6048272e75 100644 --- a/src/runtime/error.go +++ b/src/runtime/error.go @@ -72,8 +72,7 @@ func typestring(x interface{}) string { return e._type.string() } -// For calling from C. -// Prints an argument passed to panic. +// printany prints an argument passed to panic. func printany(i interface{}) { switch v := i.(type) { case nil: diff --git a/src/runtime/panic.go b/src/runtime/panic.go index 106ca5bffc..c51948bd18 100644 --- a/src/runtime/panic.go +++ b/src/runtime/panic.go @@ -408,12 +408,15 @@ func preprintpanics(p *_panic) { } // Print all currently active panics. Used when crashing. +// Should only be called after preprintpanics. func printpanics(p *_panic) { if p.link != nil { printpanics(p.link) print("\t") } print("panic: ") + // Because of preprintpanics, p.arg cannot be an error or + // stringer, so this won't call into user code. printany(p.arg) if p.recovered { print(" [recovered]") @@ -654,7 +657,7 @@ func recovery(gp *g) { gogo(&gp.sched) } -// startpanic_m implements unrecoverable panic. +// startpanic_m prepares for an unrecoverable panic. // // It can have write barriers because the write barrier explicitly // ignores writes once dying > 0. @@ -664,10 +667,12 @@ func startpanic_m() { _g_ := getg() if mheap_.cachealloc.size == 0 { // very early print("runtime: panic before malloc heap initialized\n") - _g_.m.mallocing = 1 // tell rest of panic not to try to malloc - } else if _g_.m.mcache == nil { // can happen if called from signal handler or throw - _g_.m.mcache = allocmcache() } + // Disallow malloc during an unrecoverable panic. A panic + // could happen in a signal handler, or in a throw, or inside + // malloc itself. We want to catch if an allocation ever does + // happen (even if we're not in one of these situations). + _g_.m.mallocing++ switch _g_.m.dying { case 0: |