mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[dev.regabi] cmd/compile: cleanup for concrete types - more 

Accumulated fixes to recent changes, to make the code safe
for automated deinterfacing.

Change-Id: I200737046cea88f3356b2402f09e2ca477fb8456
Reviewed-on: https://go-review.googlesource.com/c/go/+/279232
Trust: Russ Cox <rsc@golang.org>
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
This commit is contained in:
Russ Cox 2020-12-18 11:29:49 -05:00
parent c45313bf45
commit 0bb0baf683
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cmd/compile/internal/gc/order.go
View File

@ -892,12 +892,12 @@ func (o *Order) stmt(n ir.Node) {
case ir.OSELRECV2: case ir.OSELRECV2:
// case x, ok = <-c // case x, ok = <-c
r := r.(*ir.AssignListStmt)
recv := r.Rlist().First().(*ir.UnaryExpr) recv := r.Rlist().First().(*ir.UnaryExpr)
recv.SetLeft(o.expr(recv.Left(), nil)) recv.SetLeft(o.expr(recv.Left(), nil))
if recv.Left().Op() != ir.ONAME { if recv.Left().Op() != ir.ONAME {
recv.SetLeft(o.copyExpr(recv.Left())) recv.SetLeft(o.copyExpr(recv.Left()))
} }
r := r.(*ir.AssignListStmt)
init := r.PtrInit().Slice() init := r.PtrInit().Slice()
r.PtrInit().Set(nil) r.PtrInit().Set(nil)
@ -915,13 +915,11 @@ func (o *Order) stmt(n ir.Node) {
if len(init) > 0 && init[0].Op() == ir.ODCL && init[0].(*ir.Decl).Left() == n { if len(init) > 0 && init[0].Op() == ir.ODCL && init[0].(*ir.Decl).Left() == n {
init = init[1:] init = init[1:]
} }
dcl := ir.Nod(ir.ODCL, n, nil) dcl := typecheck(ir.Nod(ir.ODCL, n, nil), ctxStmt)
dcl = typecheck(dcl, ctxStmt)
ncas.PtrInit().Append(dcl) ncas.PtrInit().Append(dcl)
} }
tmp := o.newTemp(t, t.HasPointers()) tmp := o.newTemp(t, t.HasPointers())
as := ir.Nod(ir.OAS, n, conv(tmp, n.Type())) as := typecheck(ir.Nod(ir.OAS, n, conv(tmp, n.Type())), ctxStmt)
as = typecheck(as, ctxStmt)
ncas.PtrInit().Append(as) ncas.PtrInit().Append(as)
r.PtrList().SetIndex(i, tmp) r.PtrList().SetIndex(i, tmp)
} }

7
src/cmd/compile/internal/gc/select.go
View File

@ -207,8 +207,7 @@ func walkselectcases(cases ir.Nodes) []ir.Node {
} else { } else {
// TODO(cuonglm): make this use selectnbrecv() // TODO(cuonglm): make this use selectnbrecv()
// if selectnbrecv2(&v, &received, c) { body } else { default body } // if selectnbrecv2(&v, &received, c) { body } else { default body }
receivedp := ir.Nod(ir.OADDR, n.List().Second(), nil) receivedp := typecheck(nodAddr(n.List().Second()), ctxExpr)
receivedp = typecheck(receivedp, ctxExpr)
call = mkcall1(chanfn("selectnbrecv2", 2, ch.Type()), types.Types[types.TBOOL], r.PtrInit(), elem, receivedp, ch) call = mkcall1(chanfn("selectnbrecv2", 2, ch.Type()), types.Types[types.TBOOL], r.PtrInit(), elem, receivedp, ch)
} }
} }
@ -323,10 +322,12 @@ func walkselectcases(cases ir.Nodes) []ir.Node {
r := ir.Nod(ir.OIF, cond, nil) r := ir.Nod(ir.OIF, cond, nil)
if n := cas.Left(); n != nil && n.Op() == ir.OSELRECV2 && !ir.IsBlank(n.List().Second()) { if n := cas.Left(); n != nil && n.Op() == ir.OSELRECV2 {
if !ir.IsBlank(n.List().Second()) {
x := ir.Nod(ir.OAS, n.List().Second(), recvOK) x := ir.Nod(ir.OAS, n.List().Second(), recvOK)
r.PtrBody().Append(typecheck(x, ctxStmt)) r.PtrBody().Append(typecheck(x, ctxStmt))
} }
}
r.PtrBody().AppendNodes(cas.PtrBody()) r.PtrBody().AppendNodes(cas.PtrBody())
r.PtrBody().Append(ir.Nod(ir.OBREAK, nil, nil)) r.PtrBody().Append(ir.Nod(ir.OBREAK, nil, nil))