Skip to content

Commit

Permalink
cmd/compile: fix missing markHiddenClosureDead in deadcode pass
Browse files Browse the repository at this point in the history
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 <[email protected]>
Run-TryBot: Cuong Manh Le <[email protected]>
TryBot-Result: Go Bot <[email protected]>
Reviewed-by: Keith Randall <[email protected]>
  • Loading branch information
cuonglm committed Sep 19, 2021
1 parent c894b44 commit 771b8ea
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/cmd/compile/internal/deadcode/deadcode.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ func stmts(nn *ir.Nodes) {
}

if cut {
ir.VisitList((*nn)[i+1:len(*nn)], markHiddenClosureDead)
*nn = (*nn)[:i+1]
break
}
Expand Down
17 changes: 17 additions & 0 deletions test/fixedbugs/issue48459.go
Original file line number Diff line number Diff line change
@@ -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()
}()
}

0 comments on commit 771b8ea

Please sign in to comment.