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 <cuong.manhle.vn@gmail.com>
Run-TryBot: Cuong Manh Le <cuong.manhle.vn@gmail.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>

diff --git a/src/cmd/compile/internal/typecheck/typecheck.go b/src/cmd/compile/internal/typecheck/typecheck.go
index 240f0409e77391546b12308befbb6e80069ada6a..030158b1a125360e3fb2dea09d6f92bb79310faa 100644 (file)
--- 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 ed5312fa2165fe542db727b8174e3e7aa0581f34..5c0787bf1db0594e3a762245141f4803f4ee612e 100644 (file)
--- 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.
+       }()
 }