qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 07:30:05 -07:00
Code Releases Activity

cmd/compile: enable late call expansion for multiple results

Browse Source 
This does not work yet for SSA-able aggregates.

Change-Id: Ib16b9c6158b25bb957145c5f934040b2bab9babd
Reviewed-on: https://go-review.googlesource.com/c/go/+/245132
Trust: David Chase <drchase@google.com>
Run-TryBot: David Chase <drchase@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
This commit is contained in:
David Chase 2020-07-27 16:40:35 -04:00
parent 150bd4ffd4
commit 4d7abd7ae6
3 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/cmd/compile/internal/gc/ssa.go
View File

@ -2557,8 +2557,23 @@ func (s *state) expr(n *Node) *ssa.Value {
return s.addr(n.Left) return s.addr(n.Left)
case ORESULT: case ORESULT:
addr := s.constOffPtrSP(types.NewPtr(n.Type), n.Xoffset) if s.prevCall == nil || s.prevCall.Op != ssa.OpStaticLECall {
return s.load(n.Type, addr) // Do the old thing
addr := s.constOffPtrSP(types.NewPtr(n.Type), n.Xoffset)
return s.load(n.Type, addr)
}
which := s.prevCall.Aux.(*ssa.AuxCall).ResultForOffset(n.Xoffset)
if which == -1 {
// Do the old thing // TODO: Panic instead.
addr := s.constOffPtrSP(types.NewPtr(n.Type), n.Xoffset)
return s.load(n.Type, addr)
}
if canSSAType(n.Type) {
return s.newValue1I(ssa.OpSelectN, n.Type, which, s.prevCall)
} else {
addr := s.newValue1I(ssa.OpSelectNAddr, types.NewPtr(n.Type), which, s.prevCall)
return s.load(n.Type, addr)
}
case ODEREF: case ODEREF:
p := s.exprPtr(n.Left, n.Bounded(), n.Pos) p := s.exprPtr(n.Left, n.Bounded(), n.Pos)
@ -4700,7 +4715,17 @@ func (s *state) addr(n *Node) *ssa.Value {
} }
case ORESULT: case ORESULT:
// load return from callee // load return from callee
return s.constOffPtrSP(t, n.Xoffset) if s.prevCall == nil || s.prevCall.Op != ssa.OpStaticLECall {
return s.constOffPtrSP(t, n.Xoffset)
}
which := s.prevCall.Aux.(*ssa.AuxCall).ResultForOffset(n.Xoffset)
if which == -1 {
// Do the old thing // TODO: Panic instead.
return s.constOffPtrSP(t, n.Xoffset)
}
x := s.newValue1I(ssa.OpSelectNAddr, t, which, s.prevCall)
return x
case OINDEX: case OINDEX:
if n.Left.Type.IsSlice() { if n.Left.Type.IsSlice() {
a := s.expr(n.Left) a := s.expr(n.Left)

1
src/cmd/compile/internal/ssa/expand_calls.go
View File

@ -98,4 +98,3 @@ func expandCalls(f *Func) {
} }
} }
} }

13
src/cmd/compile/internal/ssa/op.go
View File

@ -79,6 +79,19 @@ type AuxCall struct {
results []Param results []Param
} }
// ResultForOffset returns the index of the result at a particular offset among the results
// This does not include the mem result for the call opcode.
func (a *AuxCall) ResultForOffset(offset int64) int64 {
which := int64(-1)
for i := int64(0); i < a.NResults(); i++ { // note aux NResults does not include mem result.
if a.OffsetOfResult(i) == offset {
which = i
break
}
}
return which
}
// OffsetOfResult returns the SP offset of result which (indexed 0, 1, etc). // OffsetOfResult returns the SP offset of result which (indexed 0, 1, etc).
func (a *AuxCall) OffsetOfResult(which int64) int64 { func (a *AuxCall) OffsetOfResult(which int64) int64 {
return int64(a.results[which].Offset) return int64(a.results[which].Offset)