Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

cmd/compile/internal/gc: remove a bunch of uses of typenod

Browse source 
Passes toolstash-check -all.

Change-Id: Ic9eb0c52bedac185ab86cc62207f199d93700344
Reviewed-on: https://go-review.googlesource.com/39795
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Robert Griesemer <gri@golang.org>
This commit is contained in:
Matthew Dempsky 2017-04-05 18:52:33 -07:00
parent 25fc842f17
commit 2e1b42a814
4 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/cmd/compile/internal/gc/bexport.go
View file

@ -1273,11 +1273,11 @@ func (p *exporter) expr(n *Node) {
p.op(ODOTTYPE)
p.pos(n)
p.expr(n.Left)
if p.bool(n.Right != nil) {
p.expr(n.Right)
} else {
p.typ(n.Type)
if n.Right != nil {
Fatalf("impossible")
}
p.bool(false)
p.typ(n.Type)
case OINDEX, OINDEXMAP:
p.op(OINDEX)

24
src/cmd/compile/internal/gc/bimport.go
View file

@ -884,13 +884,11 @@ func (p *importer) node() *Node {
// again. Re-introduce explicit uintptr(c) conversion.
// (issue 16317).
if typ.IsUnsafePtr() {
conv := nod(OCALL, typenod(Types[TUINTPTR]), nil)
conv.List.Set1(n)
n = conv
n = nod(OCONV, n, nil)
n.Type = Types[TUINTPTR]
}
conv := nod(OCALL, typenod(typ), nil)
conv.List.Set1(n)
n = conv
n = nod(OCONV, n, nil)
n.Type = typ
}
return n
@ -963,10 +961,9 @@ func (p *importer) node() *Node {
case ODOTTYPE:
n := nodl(p.pos(), ODOTTYPE, p.expr(), nil)
if p.bool() {
n.Right = p.expr()
} else {
n.Right = typenod(p.typ())
Fatalf("impossible")
}
n.Type = p.typ()
return n
// case OINDEX, OINDEXMAP, OSLICE, OSLICESTR, OSLICEARR, OSLICE3, OSLICE3ARR:
@ -989,8 +986,13 @@ func (p *importer) node() *Node {
// unreachable - mapped to OCONV case below by exporter
case OCONV:
n := nodl(p.pos(), OCALL, typenod(p.typ()), nil)
n.List.Set(p.exprList())
n := nodl(p.pos(), OCONV, nil, nil)
n.Type = p.typ()
exprs := p.exprList()
if len(exprs) != 1 {
Fatalf("impossible")
}
n.Left = exprs[0]
return n
case OCOPY, OCOMPLEX, OREAL, OIMAG, OAPPEND, OCAP, OCLOSE, ODELETE, OLEN, OMAKE, ONEW, OPANIC, ORECOVER, OPRINT, OPRINTN:

6
src/cmd/compile/internal/gc/closure.go
View file

@ -395,7 +395,7 @@ func transformclosure(xfunc *Node) {
// Declare variable holding addresses taken from closure
// and initialize in entry prologue.
addr := newname(lookup("&" + v.Sym.Name))
addr.Name.Param.Ntype = nod(OIND, typenod(v.Type), nil)
addr.Type = typPtr(v.Type)
addr.Class = PAUTO
addr.SetUsed(true)
addr.Name.Curfn = xfunc
@ -626,10 +626,10 @@ func makepartialcall(fn *Node, t0 *Type, meth *Sym) *Node {
xfunc.Func.Dcl = append(xfunc.Func.Dcl, ptr)
var body []*Node
if rcvrtype.IsPtr() || rcvrtype.IsInterface() {
ptr.Name.Param.Ntype = typenod(rcvrtype)
ptr.Type = rcvrtype
body = append(body, nod(OAS, ptr, cv))
} else {
ptr.Name.Param.Ntype = typenod(typPtr(rcvrtype))
ptr.Type = typPtr(rcvrtype)
body = append(body, nod(OAS, ptr, nod(OADDR, cv, nil)))
}

4
src/cmd/compile/internal/gc/swt.go
View file

@ -182,10 +182,10 @@ func typecheckswitch(n *Node) {
nvar := ncase.Rlist.First()
if ll.Len() == 1 && ll.First().Type != nil && !ll.First().Type.IsKind(TNIL) {
// single entry type switch
nvar.Name.Param.Ntype = typenod(ll.First().Type)
nvar.Type = ll.First().Type
} else {
// multiple entry type switch or default
nvar.Name.Param.Ntype = typenod(n.Type)
nvar.Type = n.Type
}
nvar = typecheck(nvar, Erv|Easgn)