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: simplify and clean up inlnode

Browse source 
Change-Id: I0d14d68b57e8605cdae8a45d6fa97255a42297d8
Reviewed-on: https://go-review.googlesource.com/37521
Run-TryBot: Josh Bleecher Snyder <josharian@gmail.com>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Josh Bleecher Snyder 2017-02-27 10:45:26 -08:00
parent 566e72d0ce
commit 0df81e8887
1 changed files with 10 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/cmd/compile/internal/gc/inl.go
View file

@ -405,7 +405,7 @@ func inlnode(n *Node) *Node {
case OCALLFUNC, OCALLMETH:
n.Left.setNoInline(true)
}
fallthrough
return n
// TODO do them here (or earlier),
// so escape analysis can avoid more heapmoves.
@ -445,14 +445,9 @@ func inlnode(n *Node) *Node {
}
}
// if we just replaced arg in f(arg()) or return arg with an inlined call
// and arg returns multiple values, glue as list
case ORETURN,
OCALLFUNC,
OCALLMETH,
OCALLINTER,
OAPPEND,
OCOMPLEX:
case ORETURN, OCALLFUNC, OCALLMETH, OCALLINTER, OAPPEND, OCOMPLEX:
// if we just replaced arg in f(arg()) or return arg with an inlined call
// and arg returns multiple values, glue as list
if n.List.Len() == 1 && n.List.First().Op == OINLCALL && n.List.First().Rlist.Len() > 1 {
n.List.Set(inlconv2list(n.List.First()))
break
@ -469,18 +464,12 @@ func inlnode(n *Node) *Node {
}
inlnodelist(n.Rlist)
switch n.Op {
case OAS2FUNC:
if n.Rlist.First().Op == OINLCALL {
n.Rlist.Set(inlconv2list(n.Rlist.First()))
n.Op = OAS2
n.Typecheck = 0
n = typecheck(n, Etop)
break
}
fallthrough
default:
if n.Op == OAS2FUNC && n.Rlist.First().Op == OINLCALL {
n.Rlist.Set(inlconv2list(n.Rlist.First()))
n.Op = OAS2
n.Typecheck = 0
n = typecheck(n, Etop)
} else {
s := n.Rlist.Slice()
for i1, n1 := range s {
if n1.Op == OINLCALL {