qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-26 08:07:57 -07:00
Code Releases Activity

cmd/compile: don't use dictionary convert to shaped empty interface

Browse Source 
Fixes: #53254

Change-Id: I3153d6ebb9f25957b09363f45c5cd4651ee84c2d
Reviewed-on: https://go-review.googlesource.com/c/go/+/410655
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Run-TryBot: Wayne Zuo <wdvxdr@golangcn.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Keith Randall <khr@google.com>
This commit is contained in:
Wayne Zuo 2022-06-07 09:12:21 +08:00 committed by Keith Randall
parent 2a3b467d5f
commit ff17b7d0d4
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cmd/compile/internal/noder/stencil.go
View File

@ -1349,7 +1349,7 @@ func (g *genInst) dictPass(info *instInfo) {
mce := m.(*ir.ConvExpr) mce := m.(*ir.ConvExpr)
// Note: x's argument is still typed as a type parameter. // Note: x's argument is still typed as a type parameter.
// m's argument now has an instantiated type. // m's argument now has an instantiated type.
if mce.X.Type().HasShape() || m.Type().HasShape() { if mce.X.Type().HasShape() || (m.Type().HasShape() && !m.Type().IsEmptyInterface()) {
m = convertUsingDictionary(info, info.dictParam, m.Pos(), mce.X, m, m.Type()) m = convertUsingDictionary(info, info.dictParam, m.Pos(), mce.X, m, m.Type())
} }
case ir.ODOTTYPE, ir.ODOTTYPE2: case ir.ODOTTYPE, ir.ODOTTYPE2:
@ -1446,7 +1446,7 @@ func findDictType(info *instInfo, t *types.Type) int {
// instantiated node of the CONVIFACE node or XDOT node (for a bound method call) that is causing the // instantiated node of the CONVIFACE node or XDOT node (for a bound method call) that is causing the
// conversion. // conversion.
func convertUsingDictionary(info *instInfo, dictParam *ir.Name, pos src.XPos, v ir.Node, in ir.Node, dst *types.Type) ir.Node { func convertUsingDictionary(info *instInfo, dictParam *ir.Name, pos src.XPos, v ir.Node, in ir.Node, dst *types.Type) ir.Node {
assert(v.Type().HasShape() || in.Type().HasShape()) assert(v.Type().HasShape() || (in.Type().HasShape() && !in.Type().IsEmptyInterface()))
assert(dst.IsInterface()) assert(dst.IsInterface())
if v.Type().IsInterface() { if v.Type().IsInterface() {

19
test/typeparam/issue53254.go Normal file
View File

@ -0,0 +1,19 @@
// 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
type Interface[T any] interface {
}
func F[T any]() Interface[T] {
var i int
return i
}
func main() {
F[int]()
}