diff options
| author | Dan Scales <danscales@google.com> | 2021-07-23 14:38:04 -0700 |
|---|---|---|
| committer | Dan Scales <danscales@google.com> | 2021-07-23 23:07:50 +0000 |
| commit | e6d956e1c521b948257dd20056436d133df176f6 (patch) | |
| tree | 9ba562fd715340d4a3a524a56248363b2976485f | |
| parent | 02c01725002a73739cefbc9fcf2575469be6da13 (diff) | |
| download | go-e6d956e1c521b948257dd20056436d133df176f6.tar.gz go-e6d956e1c521b948257dd20056436d133df176f6.zip | |
[dev.typeparams] cmd/compile: add CONVIFACE nodes for return values during noder2
Even if we can otherwise transform a return statement because of type
params, add CONVIFACE nodes where appropriate.
Change-Id: Ia2216d5f6805926075ba6802a4385eee1d63e37e
Reviewed-on: https://go-review.googlesource.com/c/go/+/337049
Trust: Dan Scales <danscales@google.com>
Run-TryBot: Dan Scales <danscales@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
| -rw-r--r-- | src/cmd/compile/internal/noder/stmt.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/cmd/compile/internal/noder/stmt.go b/src/cmd/compile/internal/noder/stmt.go index b7085c4776..5af4a2da9c 100644 --- a/src/cmd/compile/internal/noder/stmt.go +++ b/src/cmd/compile/internal/noder/stmt.go @@ -128,6 +128,11 @@ func (g *irgen) stmt(stmt syntax.Stmt) ir.Node { if e.Type().HasTParam() { // Delay transforming the return statement if any of the // return values have a type param. + if !ir.HasNamedResults(ir.CurFunc) { + // But add CONVIFACE nodes where needed if + // any of the return values have interface type. + typecheckaste(ir.ORETURN, nil, false, ir.CurFunc.Type().Results(), n.Results, true) + } n.SetTypecheck(3) return n } |