From 20e1d5ac8cc269c8fc40d08e0b9e14ffe99d19d3 Mon Sep 17 00:00:00 2001 From: Matthew Dempsky Date: Tue, 21 Jun 2022 04:41:38 -0700 Subject: [dev.unified] cmd/compile: special case f(g()) calls in Unified IR For f(g()) calls where g() is multi-valued, we may need to insert implicit conversions to convert g()'s result values to f()'s parameter types. This CL refactors code slightly so this will be easier to handle. Change-Id: I3a432220dcb62daecf9a66030e8fa1f097e95f95 Reviewed-on: https://go-review.googlesource.com/c/go/+/413362 Reviewed-by: David Chase TryBot-Result: Gopher Robot Run-TryBot: Matthew Dempsky --- src/cmd/compile/internal/noder/reader.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/cmd/compile/internal/noder/reader.go') diff --git a/src/cmd/compile/internal/noder/reader.go b/src/cmd/compile/internal/noder/reader.go index aa2cccf86b..bed56d1be7 100644 --- a/src/cmd/compile/internal/noder/reader.go +++ b/src/cmd/compile/internal/noder/reader.go @@ -1735,8 +1735,15 @@ func (r *reader) expr() (res ir.Node) { fun = typecheck.Callee(ir.NewSelectorExpr(pos, ir.OXDOT, fun, sym)) } pos := r.pos() - args := r.exprs() - dots := r.Bool() + var args ir.Nodes + var dots bool + if r.Bool() { // f(g()) + call := r.expr() + args = []ir.Node{call} + } else { + args = r.exprs() + dots = r.Bool() + } n := typecheck.Call(pos, fun, args, dots) switch n.Op() { case ir.OAPPEND: -- cgit v1.3-5-g9baa