mirror of
https://github.com/golang/go
synced 2024-09-29 13:24:28 -06:00
runtime: don't check for String/Error methods in printany
They have either already been called by preprintpanics, or they can not be called safely because of the various conditions checked at the start of gopanic. Fixes #24059 Change-Id: I4a6233d12c9f7aaaee72f343257ea108bae79241 Reviewed-on: https://go-review.googlesource.com/96755 Reviewed-by: Austin Clements <austin@google.com>
This commit is contained in:
parent
a5e8e2d998
commit
804e3e565e
@ -73,14 +73,12 @@ func typestring(x interface{}) string {
|
||||
}
|
||||
|
||||
// printany prints an argument passed to panic.
|
||||
// If panic is called with a value that has a String or Error method,
|
||||
// it has already been converted into a string by preprintpanics.
|
||||
func printany(i interface{}) {
|
||||
switch v := i.(type) {
|
||||
case nil:
|
||||
print("nil")
|
||||
case stringer:
|
||||
print(v.String())
|
||||
case error:
|
||||
print(v.Error())
|
||||
case bool:
|
||||
print(v)
|
||||
case int:
|
||||
|
@ -113,6 +113,14 @@ func (t *itabTableType) find(inter *interfacetype, typ *_type) *itab {
|
||||
// itabAdd adds the given itab to the itab hash table.
|
||||
// itabLock must be held.
|
||||
func itabAdd(m *itab) {
|
||||
// Bugs can lead to calling this while mallocing is set,
|
||||
// typically because this is called while panicing.
|
||||
// Crash reliably, rather than only when we need to grow
|
||||
// the hash table.
|
||||
if getg().m.mallocing != 0 {
|
||||
throw("malloc deadlock")
|
||||
}
|
||||
|
||||
t := itabTable
|
||||
if t.count >= 3*(t.size/4) { // 75% load factor
|
||||
// Grow hash table.
|
||||
|
@ -389,7 +389,6 @@ func Goexit() {
|
||||
|
||||
// Call all Error and String methods before freezing the world.
|
||||
// Used when crashing with panicking.
|
||||
// This must match types handled by printany.
|
||||
func preprintpanics(p *_panic) {
|
||||
defer func() {
|
||||
if recover() != nil {
|
||||
@ -415,8 +414,6 @@ func printpanics(p *_panic) {
|
||||
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]")
|
||||
|
Loading…
Reference in New Issue
Block a user