mirror of
https://github.com/golang/go
synced 2024-11-02 13:21:55 +00:00
cmd/compile: fix unified IR panic when expanding nested inline function
When reading body of inlining function, which has another inlined function in the body, the reader still add this inlined function to todoBodies, which it shouldn't because the inlined function was read already. To fix this, introduce new flag to signal that we are done construting all functions in todoBodies, thus the addBody shouldn't add anything to todoBodies then. Updates #48094 Change-Id: I45105dd518f0a7b69c6dcbaf23b957623f271203 Reviewed-on: https://go-review.googlesource.com/c/go/+/347529 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>
This commit is contained in:
parent
6edc57983a
commit
376a079762
5 changed files with 31 additions and 1 deletions
|
@ -927,6 +927,11 @@ var bodyReader = map[*ir.Func]pkgReaderIndex{}
|
|||
// constructed.
|
||||
var todoBodies []*ir.Func
|
||||
|
||||
// todoBodiesDone signals that we constructed all function in todoBodies.
|
||||
// This is necessary to prevent reader.addBody adds thing to todoBodies
|
||||
// when nested inlining happens.
|
||||
var todoBodiesDone = false
|
||||
|
||||
func (r *reader) addBody(fn *ir.Func) {
|
||||
pri := pkgReaderIndex{r.p, r.reloc(relocBody), r.dict}
|
||||
bodyReader[fn] = pri
|
||||
|
@ -937,7 +942,7 @@ func (r *reader) addBody(fn *ir.Func) {
|
|||
return
|
||||
}
|
||||
|
||||
if r.curfn == nil {
|
||||
if r.curfn == nil && !todoBodiesDone {
|
||||
todoBodies = append(todoBodies, fn)
|
||||
return
|
||||
}
|
||||
|
|
|
@ -136,6 +136,7 @@ func unified(noders []*noder) {
|
|||
}
|
||||
}
|
||||
todoBodies = nil
|
||||
todoBodiesDone = true
|
||||
|
||||
// Check that nothing snuck past typechecking.
|
||||
for _, n := range target.Decls {
|
||||
|
|
8
test/typeparam/issue48094b.dir/a.go
Normal file
8
test/typeparam/issue48094b.dir/a.go
Normal file
|
@ -0,0 +1,8 @@
|
|||
// 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 a
|
||||
|
||||
func F() { G(0) }
|
||||
func G[T any](t T) {}
|
9
test/typeparam/issue48094b.dir/b.go
Normal file
9
test/typeparam/issue48094b.dir/b.go
Normal file
|
@ -0,0 +1,9 @@
|
|||
// 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 b
|
||||
|
||||
import "./a"
|
||||
|
||||
func H() { a.F() }
|
7
test/typeparam/issue48094b.go
Normal file
7
test/typeparam/issue48094b.go
Normal file
|
@ -0,0 +1,7 @@
|
|||
// compiledir
|
||||
|
||||
// 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 ignored
|
Loading…
Reference in a new issue