cmd/compile: avoid padding for indirect map key or value on amd64p32

Padding needed for map buckets is dependent on the types used to
construct the map bucket. In case of indirect keys or values pointers
are used in the map bucket to the keys or values.

Change the map bucket padding calculation to take the alignment of
the key and value types used to construct the map bucket into account
instead of the original key and value type.

Since pointers are always 32bit aligned on amd64p32 this prevents
adding unneeded padding in case the key or value would have needed
64bit alignment without indirect referencing.

Change-Id: I7943448e882d269b5cff7e921a2a6f3430c50878
Reviewed-on: https://go-review.googlesource.com/60030
Reviewed-by: Keith Randall <khr@golang.org>

diff --git a/src/cmd/compile/internal/gc/reflect.go b/src/cmd/compile/internal/gc/reflect.go
index 9d9b43152ef121497f301fd75c1cb2264ba3a184..3e1f26b866d22583b146f4faf3bb2f0392c6e8d9 100644 (file)
--- a/src/cmd/compile/internal/gc/reflect.go
+++ b/src/cmd/compile/internal/gc/reflect.go
@@ -146,7 +146,7 @@ func mapbucket(t *types.Type) *types.Type {
        // so if the struct needs 64-bit padding (because a key or value does)
        // then it would end with an extra 32-bit padding field.
        // Preempt that by emitting the padding here.
-       if int(t.Val().Align) > Widthptr || int(t.Key().Align) > Widthptr {
+       if int(valtype.Align) > Widthptr || int(keytype.Align) > Widthptr {
                field = append(field, makefield("pad", types.Types[TUINTPTR]))
        }