From 70b277cf2e953bb9994b00898280f4659a47471e Mon Sep 17 00:00:00 2001 From: Cuong Manh Le Date: Thu, 4 Mar 2021 14:27:36 +0700 Subject: [PATCH] cmd/compile: only check return for valid functions CheckReturn uses fn.Type() unconditionally, so for invalid function, fn.Type() will be nil, causes the compiler crashes. Updates #43311 Change-Id: I4420dd296c72ea83986b38fbf2c7f51fa59757c8 Reviewed-on: https://go-review.googlesource.com/c/go/+/298709 Trust: Cuong Manh Le Run-TryBot: Cuong Manh Le TryBot-Result: Go Bot Reviewed-by: Matthew Dempsky --- src/cmd/compile/internal/typecheck/typecheck.go | 2 +- test/fixedbugs/issue17588.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cmd/compile/internal/typecheck/typecheck.go b/src/cmd/compile/internal/typecheck/typecheck.go index 240f0409e7..030158b1a1 100644 --- a/src/cmd/compile/internal/typecheck/typecheck.go +++ b/src/cmd/compile/internal/typecheck/typecheck.go @@ -2104,7 +2104,7 @@ func CheckUnused(fn *ir.Func) { // CheckReturn makes sure that fn terminates appropriately. func CheckReturn(fn *ir.Func) { - if fn.Type().NumResults() != 0 && len(fn.Body) != 0 { + if fn.Type() != nil && fn.Type().NumResults() != 0 && len(fn.Body) != 0 { markBreak(fn) if !isTermNodes(fn.Body) { base.ErrorfAt(fn.Endlineno, "missing return at end of function") diff --git a/test/fixedbugs/issue17588.go b/test/fixedbugs/issue17588.go index ed5312fa21..5c0787bf1d 100644 --- a/test/fixedbugs/issue17588.go +++ b/test/fixedbugs/issue17588.go @@ -1,4 +1,4 @@ -// errorcheck +// errorcheck -d=panic // Copyright 2016 The Go Authors. All rights reserved. // Use of this source code is governed by a BSD-style @@ -11,10 +11,10 @@ package p -type F func(b T) // ERROR "T .*is not a type|expected type" +type F func(b T) // ERROR "T .*is not a type|expected type" func T(fn F) { - func() { - fn(nil) // If Decldepth is not initialized properly, typecheckclosure() Fatals here. - }() + func() { + fn(nil) // If Decldepth is not initialized properly, typecheckclosure() Fatals here. + }() } -- 2.48.1