From 1edc1ccf1519afe8d2fd5cb1e488d11e7702dee2 Mon Sep 17 00:00:00 2001 From: Keith Randall Date: Thu, 10 Mar 2022 09:02:34 -0800 Subject: [PATCH] [release-branch.go1.18] cmd/compile: fix transform of OEQ/ONE when one arg is a type param At this point in stenciling, we have shape types, not raw type parameters. The code was correct in the other part of this function. Update #51522 Change-Id: Ife495160a2be5f6af5400363c3efb68dda518b5f Reviewed-on: https://go-review.googlesource.com/c/go/+/391475 Trust: Keith Randall Run-TryBot: Keith Randall Reviewed-by: Cuong Manh Le TryBot-Result: Gopher Robot Reviewed-by: Ian Lance Taylor (cherry picked from commit 8cf11694abbfbdbd4fe0b2c08511f81b8bfe5017) Reviewed-on: https://go-review.googlesource.com/c/go/+/391794 Trust: Dmitri Shuralyov Run-TryBot: Dmitri Shuralyov Reviewed-by: Keith Randall --- src/cmd/compile/internal/noder/transform.go | 2 +- test/typeparam/issue51522a.go | 42 +++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 test/typeparam/issue51522a.go diff --git a/src/cmd/compile/internal/noder/transform.go b/src/cmd/compile/internal/noder/transform.go index 5f1f41163b..db28e8de3b 100644 --- a/src/cmd/compile/internal/noder/transform.go +++ b/src/cmd/compile/internal/noder/transform.go @@ -242,7 +242,7 @@ func transformCompare(n *ir.BinaryExpr) { aop, _ := typecheck.Assignop(rt, lt) if aop != ir.OXXX { types.CalcSize(rt) - if rt.HasTParam() || rt.IsInterface() == lt.IsInterface() || rt.Size() >= 1<<16 { + if rt.HasShape() || rt.IsInterface() == lt.IsInterface() || rt.Size() >= 1<<16 { r = ir.NewConvExpr(base.Pos, aop, lt, r) r.SetTypecheck(1) } diff --git a/test/typeparam/issue51522a.go b/test/typeparam/issue51522a.go new file mode 100644 index 0000000000..31ce4bfc18 --- /dev/null +++ b/test/typeparam/issue51522a.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 + + +func f[T comparable](i any) { + var t T + + if i != t { + println("FAIL: if i != t") + } +} + +type myint int + +func (m myint) foo() { +} + +type fooer interface { + foo() +} + +type comparableFoo interface { + comparable + foo() +} + +func g[T comparableFoo](i fooer) { + var t T + + if i != t { + println("FAIL: if i != t") + } +} + +func main() { + f[int](int(0)) + g[myint](myint(0)) +} -- 2.48.1