mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor tweak to still non-portable alignment calculation 

R=rsc
DELTA=4  (1 added, 1 deleted, 2 changed)
OCL=18528
CL=18533
This commit is contained in:
Rob Pike 2008-11-05 11:02:55 -08:00
parent 554d0aa589
commit 44a82746a1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/reflect/type.go
View File

@ -289,12 +289,13 @@ func (t *StructTypeStruct) Size() int {
return t.size
}
size := 0;
structalignmask := 7; // BUG: we know structs are 8-aligned
for i := 0; i < len(t.field); i++ {
elemsize := t.field[i].typ.Get().Size();
// pad until at (elemsize mod 8) boundary
align := elemsize - 1;
if align > 7 { // BUG: we know structs are 8-aligned
align = 7
if align > structalignmask {
align = structalignmask
}
if align > 0 {
size = (size + align) & ^align;
@ -302,7 +303,6 @@ func (t *StructTypeStruct) Size() int {
t.field[i].offset = size;
size += elemsize;
}
structalignmask := 7; // TODO: knows that size fits in int32 (also can't use const here)
size = (size + structalignmask) & ^(structalignmask);
t.size = size;
return size;