From bfa7a558bf08dfa17c3a59dd156dcb022b76a433 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 1 Dec 2017 06:57:37 -0800 Subject: [PATCH] cmd/cgo: for C bitfields use only valid Go integer types Fixes #22958 Change-Id: Ib078a5f6e1105a2afca77c6d9a05f65ddf5d9010 Reviewed-on: https://go-review.googlesource.com/81435 Run-TryBot: Ian Lance Taylor TryBot-Result: Gobot Gobot Reviewed-by: Bryan Mills --- misc/cgo/test/issue22958.go | 24 ++++++++++++++++++++++++ src/cmd/cgo/gcc.go | 4 +++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 misc/cgo/test/issue22958.go diff --git a/misc/cgo/test/issue22958.go b/misc/cgo/test/issue22958.go new file mode 100644 index 0000000000..a5f058fdae --- /dev/null +++ b/misc/cgo/test/issue22958.go @@ -0,0 +1,24 @@ +// Copyright 2017 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package cgotest + +// Test handling of bitfields. + +/* +typedef struct { + unsigned long long f8 : 8; + unsigned long long f16 : 16; + unsigned long long f24 : 24; + unsigned long long f32 : 32; + unsigned long long f40 : 40; + unsigned long long f48 : 48; + unsigned long long f56 : 56; + unsigned long long f64 : 64; +} issue22958Type; +*/ +import "C" + +// Nothing to run, just make sure this compiles. +var Vissue22958 C.issue22958Type diff --git a/src/cmd/cgo/gcc.go b/src/cmd/cgo/gcc.go index a59892ef00..5cd6ac953c 100644 --- a/src/cmd/cgo/gcc.go +++ b/src/cmd/cgo/gcc.go @@ -2388,7 +2388,9 @@ func (c *typeConv) Struct(dt *dwarf.StructType, pos token.Pos) (expr *ast.Struct size := t.Size talign := t.Align if f.BitSize > 0 { - if f.BitSize%8 != 0 { + switch f.BitSize { + case 8, 16, 32, 64: + default: continue } size = f.BitSize / 8 -- 2.50.0