aboutsummaryrefslogtreecommitdiff
path: root/libgo/runtime/go-construct-map.c
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2017-01-14 00:05:42 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2017-01-14 00:05:42 +0000
commitc2047754c300b68c05d65faa8dc2925fe67b71b4 (patch)
treee183ae81a1f48a02945cb6de463a70c5be1b06f6 /libgo/runtime/go-construct-map.c
parent829afb8f05602bb31c9c597b24df7377fed4f059 (diff)
downloadgcc-c2047754c300b68c05d65faa8dc2925fe67b71b4.zip
gcc-c2047754c300b68c05d65faa8dc2925fe67b71b4.tar.gz
gcc-c2047754c300b68c05d65faa8dc2925fe67b71b4.tar.bz2
libgo: update to Go 1.8 release candidate 1
Compiler changes: * Change map assignment to use mapassign and assign value directly. * Change string iteration to use decoderune, faster for ASCII strings. * Change makeslice to take int, and use makeslice64 for larger values. * Add new noverflow field to hmap struct used for maps. Unresolved problems, to be fixed later: * Commented out test in go/types/sizes_test.go that doesn't compile. * Commented out reflect.TestStructOf test for padding after zero-sized field. Reviewed-on: https://go-review.googlesource.com/35231 gotools/: Updates for Go 1.8rc1. * Makefile.am (go_cmd_go_files): Add bug.go. (s-zdefaultcc): Write defaultPkgConfig. * Makefile.in: Rebuild. From-SVN: r244456
Diffstat (limited to 'libgo/runtime/go-construct-map.c')
-rw-r--r--libgo/runtime/go-construct-map.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/libgo/runtime/go-construct-map.c b/libgo/runtime/go-construct-map.c
index c1a8bb7..9a48d57 100644
--- a/libgo/runtime/go-construct-map.c
+++ b/libgo/runtime/go-construct-map.c
@@ -9,14 +9,15 @@
#include <stdlib.h>
#include "runtime.h"
+#include "go-type.h"
extern void *makemap (const struct __go_map_type *, int64_t hint,
void *, void *)
__asm__ (GOSYM_PREFIX "runtime.makemap");
-extern void mapassign1 (const struct __go_map_type *, void *hmap,
- const void *key, const void *val)
- __asm__ (GOSYM_PREFIX "runtime.mapassign1");
+extern void *mapassign (const struct __go_map_type *, void *hmap,
+ const void *key)
+ __asm__ (GOSYM_PREFIX "runtime.mapassign");
void *
__go_construct_map (const struct __go_map_type *type,
@@ -26,13 +27,15 @@ __go_construct_map (const struct __go_map_type *type,
void *ret;
const unsigned char *entries;
uintptr_t i;
+ void *p;
ret = makemap(type, (int64_t) count, NULL, NULL);
entries = (const unsigned char *) ventries;
for (i = 0; i < count; ++i)
{
- mapassign1 (type, ret, entries, entries + val_offset);
+ p = mapassign (type, ret, entries);
+ typedmemmove (type->__val_type, p, entries + val_offset);
entries += entry_size;
}