]> Cypherpunks repositories - gostls13.git/commitdiff
[release-branch.go1.19] cmd/compile: fix wrong dict pass condition for type assertions
authorWayne Zuo <wdvxdr@golangcn.org>
Sun, 31 Jul 2022 09:20:26 +0000 (17:20 +0800)
committerDmitri Shuralyov <dmitshur@golang.org>
Mon, 1 Aug 2022 22:42:56 +0000 (22:42 +0000)
Updates #54135.

Change-Id: I2b27af8124014b2699ea44bdc765e1fb8f6c8028
Reviewed-on: https://go-review.googlesource.com/c/go/+/420394
Reviewed-by: Keith Randall <khr@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Run-TryBot: Wayne Zuo <wdvxdr@golangcn.org>
Reviewed-by: Ian Lance Taylor <iant@google.com>
(cherry picked from commit 27038b70f860e29fdf472ac5fb208b6ad9598c10)
Reviewed-on: https://go-review.googlesource.com/c/go/+/420674
Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
src/cmd/compile/internal/noder/stencil.go
test/typeparam/issue54135.go [new file with mode: 0644]

index 280f7cdf1c0e2c4055cac0c2371592b19b37cfae..d3f51e00cd355cb6f9316e4a956fe2eff0f65379 100644 (file)
@@ -1357,6 +1357,9 @@ func (g *genInst) dictPass(info *instInfo) {
                        }
                case ir.ODOTTYPE, ir.ODOTTYPE2:
                        dt := m.(*ir.TypeAssertExpr)
+                       if dt.Type().IsEmptyInterface() || (dt.Type().IsInterface() && !dt.Type().HasShape()) {
+                               break
+                       }
                        if !dt.Type().HasShape() && !(dt.X.Type().HasShape() && !dt.X.Type().IsEmptyInterface()) {
                                break
                        }
diff --git a/test/typeparam/issue54135.go b/test/typeparam/issue54135.go
new file mode 100644 (file)
index 0000000..dffef60
--- /dev/null
@@ -0,0 +1,28 @@
+// 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 Foo struct{}
+
+func (Foo) Blanker() {}
+
+type Bar[T any] interface {
+       Blanker()
+}
+
+type Baz interface {
+       Some()
+}
+
+func check[T comparable](p Bar[T]) {
+       _, _ = p.(any)
+       _, _ = p.(Baz)
+}
+
+func main() {
+       check[int](Foo{})
+}