prog, sys: fix struct with bitfields size calculation

2 files changed, 6 insertions, 2 deletions

diff --git a/prog/prog.go b/prog/prog.go
index cd8f43d32..b6f4c62b2 100644
--- a/prog/prog.go
+++ b/prog/prog.go
@@ -112,7 +112,9 @@ func (a *Arg) Size() uintptr {
 	case *sys.StructType:
 		var size uintptr
 		for _, fld := range a.Inner {
-			size += fld.Size()
+			if fld.Type.BitfieldLength() == 0 || fld.Type.BitfieldLast() {
+				size += fld.Size()
+			}
 		}
 		return size
 	case *sys.UnionType:
diff --git a/sys/decl.go b/sys/decl.go
index 6c756fa07..d16534a7f 100644
--- a/sys/decl.go
+++ b/sys/decl.go
@@ -303,7 +303,9 @@ func (t *StructType) Size() uintptr {
 	}
 	var size uintptr
 	for _, f := range t.Fields {
-		size += f.Size()
+		if f.BitfieldLength() == 0 || f.BitfieldLast() {
+			size += f.Size()
+		}
 	}
 	return size
 }