Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

cmd/compile/internal/types2: respect IgnoreFuncBodies for function literals

Browse source 
Updates #45783.

Change-Id: Id552a60f262e2da62125acd6aec0901a82f5a29a
Reviewed-on: https://go-review.googlesource.com/c/go/+/313650
Trust: Robert Griesemer <gri@golang.org>
Run-TryBot: Robert Griesemer <gri@golang.org>
Reviewed-by: Robert Findley <rfindley@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
This commit is contained in:
Robert Griesemer 2021-04-26 12:50:44 -07:00
parent 9f601690da
commit be28caf0aa
2 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/cmd/compile/internal/types2/expr.go
View file

@ -1132,18 +1132,20 @@ func (check *Checker) exprInternal(x *operand, e syntax.Expr, hint Type) exprKin
case *syntax.FuncLit: case *syntax.FuncLit:
if sig, ok := check.typ(e.Type).(*Signature); ok { if sig, ok := check.typ(e.Type).(*Signature); ok {
// Anonymous functions are considered part of the if !check.conf.IgnoreFuncBodies && e.Body != nil {
// init expression/func declaration which contains // Anonymous functions are considered part of the
// them: use existing package-level declaration info. // init expression/func declaration which contains
decl := check.decl // capture for use in closure below // them: use existing package-level declaration info.
iota := check.iota // capture for use in closure below (#22345) decl := check.decl // capture for use in closure below
// Don't type-check right away because the function may iota := check.iota // capture for use in closure below (#22345)
// be part of a type definition to which the function // Don't type-check right away because the function may
// body refers. Instead, type-check as soon as possible, // be part of a type definition to which the function
// but before the enclosing scope contents changes (#22992). // body refers. Instead, type-check as soon as possible,
check.later(func() { // but before the enclosing scope contents changes (#22992).
check.funcBody(decl, "<function literal>", sig, e.Body, iota) check.later(func() {
}) check.funcBody(decl, "<function literal>", sig, e.Body, iota)
})
}
x.mode = value x.mode = value
x.typ = sig x.typ = sig
} else { } else {

4
src/cmd/compile/internal/types2/stmt.go
View file

@ -13,6 +13,10 @@ import (
) )
func (check *Checker) funcBody(decl *declInfo, name string, sig *Signature, body *syntax.BlockStmt, iota constant.Value) { func (check *Checker) funcBody(decl *declInfo, name string, sig *Signature, body *syntax.BlockStmt, iota constant.Value) {
if check.conf.IgnoreFuncBodies {
panic("internal error: function body not ignored")
}
if check.conf.Trace { if check.conf.Trace {
check.trace(body.Pos(), "--- %s: %s", name, sig) check.trace(body.Pos(), "--- %s: %s", name, sig)
defer func() { defer func() {