qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-26 06:27:58 -07:00
Code Releases Activity

[dev.regabi] cmd/compile: use *ir.Name where possible in inl.go

Browse Source 
Passes toolstash -cmp.

Change-Id: Ic99a5189ad0fca37bccb0e4b4d13793adc4f8fd8
Reviewed-on: https://go-review.googlesource.com/c/go/+/280715
Trust: Cuong Manh Le <cuong.manhle.vn@gmail.com>
Run-TryBot: Cuong Manh Le <cuong.manhle.vn@gmail.com>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
This commit is contained in:
Cuong Manh Le 2021-01-01 23:20:47 +07:00
parent bfa97ba48f
commit 7958a23ea3
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/cmd/compile/internal/inline/inl.go
View File

@ -639,17 +639,19 @@ func inlCallee(fn ir.Node) *ir.Func {
return nil return nil
} }
func inlParam(t *types.Field, as ir.Node, inlvars map[*ir.Name]ir.Node) ir.Node { func inlParam(t *types.Field, as ir.Node, inlvars map[*ir.Name]*ir.Name) ir.Node {
n := ir.AsNode(t.Nname) if t.Nname == nil {
if n == nil || ir.IsBlank(n) {
return ir.BlankNode return ir.BlankNode
} }
n := t.Nname.(*ir.Name)
inlvar := inlvars[n.(*ir.Name)] if ir.IsBlank(n) {
return ir.BlankNode
}
inlvar := inlvars[n]
if inlvar == nil { if inlvar == nil {
base.Fatalf("missing inlvar for %v", n) base.Fatalf("missing inlvar for %v", n)
} }
as.PtrInit().Append(ir.NewDecl(base.Pos, ir.ODCL, inlvar.(*ir.Name))) as.PtrInit().Append(ir.NewDecl(base.Pos, ir.ODCL, inlvar))
inlvar.Name().Defn = as inlvar.Name().Defn = as
return inlvar return inlvar
} }
@ -748,10 +750,10 @@ func mkinlcall(n *ir.CallExpr, fn *ir.Func, maxCost int32, inlMap map[*ir.Func]b
} }
// Make temp names to use instead of the originals. // Make temp names to use instead of the originals.
inlvars := make(map[*ir.Name]ir.Node) inlvars := make(map[*ir.Name]*ir.Name)
// record formals/locals for later post-processing // record formals/locals for later post-processing
var inlfvars []ir.Node var inlfvars []*ir.Name
for _, ln := range fn.Inl.Dcl { for _, ln := range fn.Inl.Dcl {
if ln.Op() != ir.ONAME { if ln.Op() != ir.ONAME {
@ -767,7 +769,7 @@ func mkinlcall(n *ir.CallExpr, fn *ir.Func, maxCost int32, inlMap map[*ir.Func]b
// nothing should have moved to the heap yet. // nothing should have moved to the heap yet.
base.Fatalf("impossible: %v", ln) base.Fatalf("impossible: %v", ln)
} }
inlf := typecheck.Expr(inlvar(ln)) inlf := typecheck.Expr(inlvar(ln)).(*ir.Name)
inlvars[ln] = inlf inlvars[ln] = inlf
if base.Flag.GenDwarfInl > 0 { if base.Flag.GenDwarfInl > 0 {
if ln.Class_ == ir.PPARAM { if ln.Class_ == ir.PPARAM {
@ -795,11 +797,11 @@ func mkinlcall(n *ir.CallExpr, fn *ir.Func, maxCost int32, inlMap map[*ir.Func]b
// temporaries for return values. // temporaries for return values.
var retvars []ir.Node var retvars []ir.Node
for i, t := range fn.Type().Results().Fields().Slice() { for i, t := range fn.Type().Results().Fields().Slice() {
var m ir.Node var m *ir.Name
if n := ir.AsNode(t.Nname); n != nil && !ir.IsBlank(n) && !strings.HasPrefix(n.Sym().Name, "~r") { if nn := t.Nname; nn != nil && !ir.IsBlank(nn.(*ir.Name)) && !strings.HasPrefix(nn.Sym().Name, "~r") {
n := n.(*ir.Name) n := nn.(*ir.Name)
m = inlvar(n) m = inlvar(n)
m = typecheck.Expr(m) m = typecheck.Expr(m).(*ir.Name)
inlvars[n] = m inlvars[n] = m
delayretvars = false // found a named result parameter delayretvars = false // found a named result parameter
} else { } else {
@ -966,7 +968,7 @@ func mkinlcall(n *ir.CallExpr, fn *ir.Func, maxCost int32, inlMap map[*ir.Func]b
// Every time we expand a function we generate a new set of tmpnames, // Every time we expand a function we generate a new set of tmpnames,
// PAUTO's in the calling functions, and link them off of the // PAUTO's in the calling functions, and link them off of the
// PPARAM's, PAUTOS and PPARAMOUTs of the called function. // PPARAM's, PAUTOS and PPARAMOUTs of the called function.
func inlvar(var_ ir.Node) ir.Node { func inlvar(var_ *ir.Name) *ir.Name {
if base.Flag.LowerM > 3 { if base.Flag.LowerM > 3 {
fmt.Printf("inlvar %+v\n", var_) fmt.Printf("inlvar %+v\n", var_)
} }
@ -976,14 +978,14 @@ func inlvar(var_ ir.Node) ir.Node {
n.Class_ = ir.PAUTO n.Class_ = ir.PAUTO
n.SetUsed(true) n.SetUsed(true)
n.Curfn = ir.CurFunc // the calling function, not the called one n.Curfn = ir.CurFunc // the calling function, not the called one
n.SetAddrtaken(var_.Name().Addrtaken()) n.SetAddrtaken(var_.Addrtaken())
ir.CurFunc.Dcl = append(ir.CurFunc.Dcl, n) ir.CurFunc.Dcl = append(ir.CurFunc.Dcl, n)
return n return n
} }
// Synthesize a variable to store the inlined function's results in. // Synthesize a variable to store the inlined function's results in.
func retvar(t *types.Field, i int) ir.Node { func retvar(t *types.Field, i int) *ir.Name {
n := typecheck.NewName(typecheck.LookupNum("~R", i)) n := typecheck.NewName(typecheck.LookupNum("~R", i))
n.SetType(t.Type) n.SetType(t.Type)
n.Class_ = ir.PAUTO n.Class_ = ir.PAUTO
@ -1018,7 +1020,7 @@ type inlsubst struct {
// "return" statement. // "return" statement.
delayretvars bool delayretvars bool
inlvars map[*ir.Name]ir.Node inlvars map[*ir.Name]*ir.Name
// bases maps from original PosBase to PosBase with an extra // bases maps from original PosBase to PosBase with an extra
// inlined call frame. // inlined call frame.