From: Devon H. O'Dell <devon.odell@gmail.com>
Date: Thu, 17 Dec 2009 20:38:29 +0000 (-0800)
Subject: Use BitSize instead of the field's type native ByteSize when calculating
X-Git-Tag: weekly.2009-12-22~25
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=7a5f4be97e1b2d61c56c333b47470514472bd05d;p=gostls13.git

Use BitSize instead of the field's type native ByteSize when calculating
structs containing bitfields.

Fixes #163.

R=rsc
CC=golang-dev
https://golang.org/cl/180059
---

diff --git a/src/cmd/cgo/gcc.go b/src/cmd/cgo/gcc.go
index 07bfa8ab65..aeca50eece 100644
--- a/src/cmd/cgo/gcc.go
+++ b/src/cmd/cgo/gcc.go
@@ -693,6 +693,9 @@ func (c *typeConv) Struct(dt *dwarf.StructType) (expr *ast.StructType, csyntax s
 	}
 
 	for _, f := range dt.Field {
+		if f.BitSize > 0 && f.BitSize != f.ByteSize*8 {
+			continue
+		}
 		if f.ByteOffset > off {
 			fld = c.pad(fld, f.ByteOffset-off)
 			off = f.ByteOffset