reflect: undo register count increments on register assignment failure

Currently when register assignment fails we roll back all the abiParts
that were generated in the process. However, the total number of
registers also increases, but does not get rolled back. The result is
a very incorrect register assignment.

For #40724.
For #44816.

Change-Id: I1934ea5f95f7608ff2067166255099dbc9135e8c
Reviewed-on: https://go-review.googlesource.com/c/go/+/306109
Trust: Michael Knyszek <mknyszek@google.com>
Run-TryBot: Michael Knyszek <mknyszek@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Austin Clements <austin@google.com>
Reviewed-by: Cherry Zhang <cherryyz@google.com>

diff --git a/src/reflect/abi.go b/src/reflect/abi.go
index 50e63121728a2bffd7706782a4b14bdaf8592a3b..002e4598b95596f029eca07f7349ad9156f960ed 100644 (file)
--- a/src/reflect/abi.go
+++ b/src/reflect/abi.go
@@ -121,6 +121,7 @@ func (a *abiSeq) stepsForValue(i int) []abiStep {
 // If the value was stack-assigned, returns the single
 // abiStep describing that translation, and nil otherwise.
 func (a *abiSeq) addArg(t *rtype) *abiStep {
+       // We'll always be adding a new value, so do that first.
        pStart := len(a.steps)
        a.valueStart = append(a.valueStart, pStart)
        if t.size == 0 {
@@ -141,8 +142,13 @@ func (a *abiSeq) addArg(t *rtype) *abiStep {
                a.stackBytes = align(a.stackBytes, uintptr(t.align))
                return nil
        }
+       // Hold a copy of "a" so that we can roll back if
+       // register assignment fails.
+       aOld := *a
        if !a.regAssign(t, 0) {
-               a.steps = a.steps[:pStart]
+               // Register assignment failed. Roll back any changes
+               // and stack-assign.
+               *a = aOld
                a.stackAssign(t.size, uintptr(t.align))
                return &a.steps[len(a.steps)-1]
        }

diff --git a/src/reflect/abi_test.go b/src/reflect/abi_test.go
index 418896ee8768ed40d836f317c3fcfcd77bc54f8f..d658a0f6d34b2ed29eb1f882e80d3f095aecb602 100644 (file)
--- a/src/reflect/abi_test.go
+++ b/src/reflect/abi_test.go
@@ -85,6 +85,7 @@ func TestReflectValueCallABI(t *testing.T) {
                passStruct13,
                pass2Struct1,
                passEmptyStruct,
+               passStruct10AndSmall,
        } {
                fn := reflect.ValueOf(fn)
                t.Run(runtime.FuncForPC(fn.Pointer()).Name(), func(t *testing.T) {
@@ -339,6 +340,14 @@ func passEmptyStruct(a int, b struct{}, c float64) (int, struct{}, float64) {
        return a, b, c
 }
 
+// This test case forces a large argument to the stack followed by more
+// in-register arguments.
+//go:registerparams
+//go:noinline
+func passStruct10AndSmall(a Struct10, b byte, c uint) (Struct10, byte, uint) {
+       return a, b, c
+}
+
 // Struct1 is a simple integer-only aggregate struct.
 type Struct1 struct {
        A, B, C uint