From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Wed, 2 Jul 2014 14:23:45 +0000 (+0000)
Subject: re PR go/61620 (FAIL: go.test/test/fixedbugs/bug242.go execution,  -O2 -g)
X-Git-Tag: releases/gcc-5.1.0~6525
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9490fda67a801ad2618849b2d3a60b920d3713ca;p=thirdparty%2Fgcc.git

re PR go/61620 (FAIL: go.test/test/fixedbugs/bug242.go execution,  -O2 -g)

	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.

From-SVN: r212233
---

diff --git a/libgo/runtime/go-map-delete.c b/libgo/runtime/go-map-delete.c
index f8f8907c345b..de8b0469deaf 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;
 	}