From: Ian Lance Taylor Date: Mon, 9 Mar 2015 23:43:16 +0000 (+0000) Subject: re PR go/65349 (go tool crashes, can't compile go code on 32bit linux systems) X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=dc4d494ae91b055b0b2cac39a6aaa8c6352f09c8;p=gcc.git re PR go/65349 (go tool crashes, can't compile go code on 32bit linux systems) PR go/65349 runtime: Don't crash if explicitly freeing small map. From-SVN: r221292 --- diff --git a/libgo/runtime/go-map-index.c b/libgo/runtime/go-map-index.c index 499641c5e14..616b00c68c8 100644 --- a/libgo/runtime/go-map-index.c +++ b/libgo/runtime/go-map-index.c @@ -8,6 +8,7 @@ #include #include "runtime.h" +#include "malloc.h" #include "go-alloc.h" #include "go-assert.h" #include "map.h" @@ -63,7 +64,8 @@ __go_map_rehash (struct __go_map *map) } } - __go_free (old_buckets); + if (old_bucket_count * sizeof (void *) >= TinySize) + __go_free (old_buckets); map->__bucket_count = new_bucket_count; map->__buckets = new_buckets;