diff options
| author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-07-02 14:23:45 +0000 |
|---|---|---|
| committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-07-02 14:23:45 +0000 |
| commit | d57c59236cf53035a2402f6656dba43ed4db8276 (patch) | |
| tree | b1f7f5b6fb32131dd3b18b057a6e9ac979581aca /libgo | |
| parent | 0329998ebcfd73055e1d031d0709ce5a4b509fd7 (diff) | |
| download | gcc-d57c59236cf53035a2402f6656dba43ed4db8276.tar.gz | |
PR go/61620
runtime: Don't free tiny blocks in map deletion.
The memory allocator now has a special case for tiny blocks
(smaller than 16 bytes) and they can not be explicitly freed.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@212233 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo')
| -rw-r--r-- | libgo/runtime/go-map-delete.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libgo/runtime/go-map-delete.c b/libgo/runtime/go-map-delete.c index f8f8907c345..de8b0469dea 100644 --- a/libgo/runtime/go-map-delete.c +++ b/libgo/runtime/go-map-delete.c @@ -8,6 +8,7 @@ #include <stdlib.h> #include "runtime.h" +#include "malloc.h" #include "go-alloc.h" #include "go-assert.h" #include "map.h" @@ -47,7 +48,8 @@ __go_map_delete (struct __go_map *map, const void *key) if (equalfn (key, entry + key_offset, key_size)) { *pentry = *(void **) entry; - __go_free (entry); + if (descriptor->__entry_size >= TinySize) + __go_free (entry); map->__element_count -= 1; break; } |