reflect: special-case panic message when returning Value{} from MakeFunc function

Before this CL we used to panic with "nil pointer dereference" because
the value we're calling assignTo on is the zero Value. Provide a better
error message.

Fixes #28748

Change-Id: I7dd4c9e30b599863664d91e78cc45878d8b0052e
Reviewed-on: https://go-review.googlesource.com/c/go/+/175440
Run-TryBot: Keith Randall <khr@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Keith Randall 2019-05-06 12:58:54 -07:00 committed by Keith Randall
parent 31c4e09915
commit 04845fe78a
2 changed files with 36 additions and 0 deletions

View File

@ -560,6 +560,10 @@ func callReflect(ctxt *makeFuncImpl, frame unsafe.Pointer, retValid *bool) {
}
for i, typ := range ftyp.out() {
v := out[i]
if v.typ == nil {
panic("reflect: function created by MakeFunc using " + funcName(f) +
" returned zero Value")
}
if v.flag&flagRO != 0 {
panic("reflect: function created by MakeFunc using " + funcName(f) +
" returned value obtained from unexported field")

View File

@ -0,0 +1,32 @@
// run
package main
import (
"fmt"
"reflect"
"strings"
)
// Copyright 2019 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
func main() {
defer func() {
e := recover()
if e == nil {
panic("should have panicked")
}
text := fmt.Sprintf("%s", e) // handles both string and runtime.errorString
if !strings.HasPrefix(text, "reflect:") {
panic("wanted a reflect error, got this instead:\n" + text)
}
}()
r := reflect.MakeFunc(reflect.TypeOf(func() error { return nil }),
func(args []reflect.Value) []reflect.Value {
var x [1]reflect.Value
return x[:]
}).Interface().(func() error)
r()
}