diff options
| author | Cuong Manh Le <cuong.manhle.vn@gmail.com> | 2021-09-18 23:46:47 +0700 |
|---|---|---|
| committer | Cuong Manh Le <cuong.manhle.vn@gmail.com> | 2021-09-19 02:43:09 +0000 |
| commit | 771b8ea4f4c56b3e27351807ade7ef72c3a15750 (patch) | |
| tree | c65ceab7b4f1ce60090c04c8336b2e59d298bf14 | |
| parent | c894b442d1e5e150ad33fa3ce13dbfab1c037b3a (diff) | |
| download | go-771b8ea4f4c56b3e27351807ade7ef72c3a15750.tar.gz go-771b8ea4f4c56b3e27351807ade7ef72c3a15750.zip | |
cmd/compile: fix missing markHiddenClosureDead in deadcode pass
CL 342350 fixed panic with dead hidden closures, by marking discarded
hidden closure as dead, and won't compile them. However, the fix is
incomplete. In case the "if" or "else" block end with panic or return
statement:
if true { return }
# All nodes starts from here are dead
the dead nodes must be processed with markHiddenClosureDead, but they
are not, causing the compiler crashes.
This CL adds that missing part.
Fixes #48459
Change-Id: Ibdd10a61fc6459d139bbf4a66b0893b523ac6b67
Reviewed-on: https://go-review.googlesource.com/c/go/+/350695
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: Keith Randall <khr@golang.org>
| -rw-r--r-- | src/cmd/compile/internal/deadcode/deadcode.go | 1 | ||||
| -rw-r--r-- | test/fixedbugs/issue48459.go | 17 |
2 files changed, 18 insertions, 0 deletions
diff --git a/src/cmd/compile/internal/deadcode/deadcode.go b/src/cmd/compile/internal/deadcode/deadcode.go index 3658c89912..65a48b6803 100644 --- a/src/cmd/compile/internal/deadcode/deadcode.go +++ b/src/cmd/compile/internal/deadcode/deadcode.go @@ -117,6 +117,7 @@ func stmts(nn *ir.Nodes) { } if cut { + ir.VisitList((*nn)[i+1:len(*nn)], markHiddenClosureDead) *nn = (*nn)[:i+1] break } diff --git a/test/fixedbugs/issue48459.go b/test/fixedbugs/issue48459.go new file mode 100644 index 0000000000..ceb7788ae4 --- /dev/null +++ b/test/fixedbugs/issue48459.go @@ -0,0 +1,17 @@ +// compile + +// Copyright 2021 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() { + if true { + return + } + + defer func() { + recover() + }() +} |