diff options
Diffstat (limited to 'src/runtime/malloc.go')
| -rw-r--r-- | src/runtime/malloc.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/runtime/malloc.go b/src/runtime/malloc.go index d9f52399b8..ad1123be96 100644 --- a/src/runtime/malloc.go +++ b/src/runtime/malloc.go @@ -589,9 +589,9 @@ func mallocgc(size uintptr, typ *_type, flags uint32) unsafe.Pointer { } else if size&1 == 0 { off = round(off, 2) } - if off+size <= maxTinySize && c.tiny != nil { + if off+size <= maxTinySize && c.tiny != 0 { // The object fits into existing tiny block. - x = add(c.tiny, off) + x = unsafe.Pointer(c.tiny + off) c.tinyoffset = off + size c.local_tinyallocs++ mp.mallocing = 0 @@ -618,8 +618,8 @@ func mallocgc(size uintptr, typ *_type, flags uint32) unsafe.Pointer { (*[2]uint64)(x)[1] = 0 // See if we need to replace the existing tiny block with the new one // based on amount of remaining free space. - if size < c.tinyoffset || c.tiny == nil { - c.tiny = x + if size < c.tinyoffset || c.tiny == 0 { + c.tiny = uintptr(x) c.tinyoffset = size } size = maxTinySize |