diff options
author | Cuong Manh Le <cuong.manhle.vn@gmail.com> | 2022-03-21 18:49:37 +0700 |
---|---|---|
committer | Cherry Mui <cherryyz@google.com> | 2022-04-04 19:55:44 +0000 |
commit | c258e9d07dce0ef156d5a9c930bc15e3a0276599 (patch) | |
tree | d747c734bff3b2093ffc19e0085c5a03064f1741 | |
parent | d17c5731ba38f9e031770cc104c8b218a6b5ece1 (diff) | |
download | go-c258e9d07dce0ef156d5a9c930bc15e3a0276599.tar.gz go-c258e9d07dce0ef156d5a9c930bc15e3a0276599.zip |
[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 <cuong.manhle.vn@gmail.com>
Run-TryBot: Cuong Manh Le <cuong.manhle.vn@gmail.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Reviewed-on: https://go-review.googlesource.com/c/go/+/394080
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
-rw-r--r-- | src/cmd/compile/internal/deadcode/deadcode.go | 1 | ||||
-rw-r--r-- | test/fixedbugs/issue51839.go | 22 |
2 files changed, 23 insertions, 0 deletions
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() + }() + }() + } +} |