From 460a93b54af4a0305f6007e44e41e6160a6469d8 Mon Sep 17 00:00:00 2001 From: Cuong Manh Le Date: Sat, 11 Jun 2022 01:33:11 +0700 Subject: [PATCH] [release-branch.go1.18] cmd/compile: fix missing dict pass for type assertions For type assertions, if either src or dst type has shape, we must convert them to dynamic type assertions. Fixes #53357 Change-Id: Ia3362fa67c011febcbdb5b26f856d081b5c366de Reviewed-on: https://go-review.googlesource.com/c/go/+/411617 Run-TryBot: Cuong Manh Le TryBot-Result: Gopher Robot Reviewed-by: Matthew Dempsky Reviewed-by: Cherry Mui Reviewed-by: Keith Randall Reviewed-on: https://go-review.googlesource.com/c/go/+/411934 Reviewed-by: Keith Randall --- src/cmd/compile/internal/noder/stencil.go | 4 +-- test/typeparam/issue53309.go | 42 +++++++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 test/typeparam/issue53309.go diff --git a/src/cmd/compile/internal/noder/stencil.go b/src/cmd/compile/internal/noder/stencil.go index 58b7b9e8dd..7cfd70ec54 100644 --- a/src/cmd/compile/internal/noder/stencil.go +++ b/src/cmd/compile/internal/noder/stencil.go @@ -1297,10 +1297,10 @@ func (g *genInst) dictPass(info *instInfo) { m = convertUsingDictionary(info, info.dictParam, m.Pos(), mce.X, m, m.Type(), false) } case ir.ODOTTYPE, ir.ODOTTYPE2: - if !m.Type().HasShape() { + dt := m.(*ir.TypeAssertExpr) + if !dt.Type().HasShape() && !dt.X.Type().HasShape() { break } - dt := m.(*ir.TypeAssertExpr) var rt ir.Node if dt.Type().IsInterface() || dt.X.Type().IsEmptyInterface() { ix := findDictType(info, m.Type()) diff --git a/test/typeparam/issue53309.go b/test/typeparam/issue53309.go new file mode 100644 index 0000000000..d505f6b58a --- /dev/null +++ b/test/typeparam/issue53309.go @@ -0,0 +1,42 @@ +// run -gcflags=-G=3 + +// 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 TaskInput interface { + deps() []*taskDefinition +} + +type Value[T any] interface { + metaValue +} + +type metaValue interface { + TaskInput +} + +type taskDefinition struct { +} + +type taskResult struct { + task *taskDefinition +} + +func (tr *taskResult) deps() []*taskDefinition { + return nil +} + +func use[T any](v Value[T]) { + _, ok := v.(*taskResult) + if !ok { + panic("output must be *taskResult") + } +} + +func main() { + tr := &taskResult{&taskDefinition{}} + use(Value[string](tr)) +} -- 2.50.0