@@ -2244,15 +2244,14 @@ func bucketOf(ktyp, etyp *rtype) *rtype {
2244
2244
}
2245
2245
2246
2246
// Prepare GC data if any.
2247
- // A bucket is at most bucketSize*(1+maxKeySize+maxValSize)+2* ptrSize bytes,
2248
- // or 2072 bytes, or 259 pointer-size words, or 33 bytes of pointer bitmap.
2247
+ // A bucket is at most bucketSize*(1+maxKeySize+maxValSize)+ptrSize bytes,
2248
+ // or 2064 bytes, or 258 pointer-size words, or 33 bytes of pointer bitmap.
2249
2249
// Note that since the key and value are known to be <= 128 bytes,
2250
2250
// they're guaranteed to have bitmaps instead of GC programs.
2251
2251
var gcdata * byte
2252
2252
var ptrdata uintptr
2253
- var overflowPad uintptr
2254
2253
2255
- size := bucketSize * (1 + ktyp .size + etyp .size ) + overflowPad + goarch .PtrSize
2254
+ size := bucketSize * (1 + ktyp .size + etyp .size ) + goarch .PtrSize
2256
2255
if size & uintptr (ktyp .align - 1 ) != 0 || size & uintptr (etyp .align - 1 ) != 0 {
2257
2256
panic ("reflect: bad size computation in MapOf" )
2258
2257
}
@@ -2271,7 +2270,6 @@ func bucketOf(ktyp, etyp *rtype) *rtype {
2271
2270
emitGCMask (mask , base , etyp , bucketSize )
2272
2271
}
2273
2272
base += bucketSize * etyp .size / goarch .PtrSize
2274
- base += overflowPad / goarch .PtrSize
2275
2273
2276
2274
word := base
2277
2275
mask [word / 8 ] |= 1 << (word % 8 )
@@ -2291,9 +2289,6 @@ func bucketOf(ktyp, etyp *rtype) *rtype {
2291
2289
ptrdata : ptrdata ,
2292
2290
gcdata : gcdata ,
2293
2291
}
2294
- if overflowPad > 0 {
2295
- b .align = 8
2296
- }
2297
2292
s := "bucket(" + ktyp .String () + "," + etyp .String () + ")"
2298
2293
b .str = resolveReflectName (newName (s , "" , false ))
2299
2294
return b
0 commit comments