From c258e9d07dce0ef156d5a9c930bc15e3a0276599 Mon Sep 17 00:00:00 2001 From: Cuong Manh Le Date: Mon, 21 Mar 2022 18:49:37 +0700 Subject: [PATCH] [release-branch.go1.18] cmd/compile: fix panic with nested dead hidden closures CL 342350 fixed deadcode panic with dead hidden closures. However, a closure may contains nested dead hidden closures, so we need to mark them dead as well. Fixes #51846 Change-Id: Ib54581adfc1bdea60e74d733cd30fd8e783da983 Reviewed-on: https://go-review.googlesource.com/c/go/+/394079 Trust: Cuong Manh Le Run-TryBot: Cuong Manh Le TryBot-Result: Gopher Robot Reviewed-by: Cherry Mui Reviewed-on: https://go-review.googlesource.com/c/go/+/394080 Reviewed-by: Matthew Dempsky --- src/cmd/compile/internal/deadcode/deadcode.go | 1 + test/fixedbugs/issue51839.go | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 test/fixedbugs/issue51839.go diff --git a/src/cmd/compile/internal/deadcode/deadcode.go b/src/cmd/compile/internal/deadcode/deadcode.go index 65a48b6803..c37a5a6990 100644 --- a/src/cmd/compile/internal/deadcode/deadcode.go +++ b/src/cmd/compile/internal/deadcode/deadcode.go @@ -163,4 +163,5 @@ func markHiddenClosureDead(n ir.Node) { if clo.Func.IsHiddenClosure() { clo.Func.SetIsDeadcodeClosure(true) } + ir.VisitList(clo.Func.Body, markHiddenClosureDead) } diff --git a/test/fixedbugs/issue51839.go b/test/fixedbugs/issue51839.go new file mode 100644 index 0000000000..c3c18915b4 --- /dev/null +++ b/test/fixedbugs/issue51839.go @@ -0,0 +1,22 @@ +// compile + +// Copyright 2022 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. + +package main + +func main() { + testRecover() + +} + +func testRecover() { + if false { + func() { + defer func() { + _ = recover() + }() + }() + } +} -- 2.48.1