diff options
| author | Matthew Dempsky <mdempsky@google.com> | 2016-02-21 02:28:37 -0800 |
|---|---|---|
| committer | Matthew Dempsky <mdempsky@google.com> | 2016-10-05 17:44:27 +0000 |
| commit | f54c0db859867f415a0702c8ceaa30c1a8976b0b (patch) | |
| tree | 6e92cbf9d57c120ac8c401366e255f0ec5dbdf19 /src | |
| parent | 30088ac9a391d8505a3e016f36aaa23170109f6f (diff) | |
| download | go-f54c0db859867f415a0702c8ceaa30c1a8976b0b.tar.xz | |
cmd/compile, cmd/cgo: align complex{64,128} like GCC
complex64 and complex128 are treated like [2]float32 and [2]float64,
so it makes sense to align them the same way.
Change-Id: Ic614bcdcc91b080aeb1ad1fed6fc15ba5a2971f8
Reviewed-on: https://go-review.googlesource.com/19800
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Russ Cox <rsc@golang.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/cgo/gcc.go | 2 | ||||
| -rw-r--r-- | src/cmd/cgo/out.go | 4 | ||||
| -rw-r--r-- | src/cmd/compile/internal/gc/align.go | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/cmd/cgo/gcc.go b/src/cmd/cgo/gcc.go index fc1d01100d..9c268ca494 100644 --- a/src/cmd/cgo/gcc.go +++ b/src/cmd/cgo/gcc.go @@ -1641,7 +1641,7 @@ func (c *typeConv) Type(dtype dwarf.Type, pos token.Pos) *Type { case 16: t.Go = c.complex128 } - if t.Align = t.Size; t.Align >= c.ptrSize { + if t.Align = t.Size / 2; t.Align >= c.ptrSize { t.Align = c.ptrSize } diff --git a/src/cmd/cgo/out.go b/src/cmd/cgo/out.go index 5dfb3a1cd8..50d6b728b7 100644 --- a/src/cmd/cgo/out.go +++ b/src/cmd/cgo/out.go @@ -1232,8 +1232,8 @@ var goTypes = map[string]*Type{ "uint64": {Size: 8, Align: 8, C: c("GoUint64")}, "float32": {Size: 4, Align: 4, C: c("GoFloat32")}, "float64": {Size: 8, Align: 8, C: c("GoFloat64")}, - "complex64": {Size: 8, Align: 8, C: c("GoComplex64")}, - "complex128": {Size: 16, Align: 16, C: c("GoComplex128")}, + "complex64": {Size: 8, Align: 4, C: c("GoComplex64")}, + "complex128": {Size: 16, Align: 8, C: c("GoComplex128")}, } // Map an ast type to a Type. diff --git a/src/cmd/compile/internal/gc/align.go b/src/cmd/compile/internal/gc/align.go index 2aae3425d4..375870ee80 100644 --- a/src/cmd/compile/internal/gc/align.go +++ b/src/cmd/compile/internal/gc/align.go @@ -169,10 +169,14 @@ func dowidth(t *Type) { case TINT32, TUINT32, TFLOAT32: w = 4 - case TINT64, TUINT64, TFLOAT64, TCOMPLEX64: + case TINT64, TUINT64, TFLOAT64: w = 8 t.Align = uint8(Widthreg) + case TCOMPLEX64: + w = 8 + t.Align = 4 + case TCOMPLEX128: w = 16 t.Align = uint8(Widthreg) |