From 9734500e9b7e9303e1d8bd4785cca4a82d9656af Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 31 Jan 2018 18:25:17 +0000 Subject: [PATCH] runtime: fix type descriptor name in C code I forgot to update the name of the map[string]bool type descriptor used in go-fieldtrack.c. This didn't cause any errors because it's a weak symbol, and the current testsuite has no field tracking tests. Reviewed-on: https://go-review.googlesource.com/91096 From-SVN: r257249 --- gcc/go/gofrontend/MERGE | 2 +- libgo/runtime/go-fieldtrack.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 3576668..bcc8136 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -00f87806635655339dbbca59e6ae2ea8231cf9b1 +17325c96ccbee4ad6bed1cd3d9517f7dfbdf3ea7 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/runtime/go-fieldtrack.c b/libgo/runtime/go-fieldtrack.c index 7be259e..4ac0a34 100644 --- a/libgo/runtime/go-fieldtrack.c +++ b/libgo/runtime/go-fieldtrack.c @@ -46,7 +46,9 @@ extern void *mapassign (const struct __go_map_type *, void *hmap, __asm__ (GOSYM_PREFIX "runtime.mapassign"); // The type descriptor for map[string] bool. */ -extern const char __go_td_MN6_string__N4_bool[] __attribute__ ((weak)); +extern const char map_string_bool[] __attribute__ ((weak)); +extern const char map_string_bool[] + __asm__ (GOSYM_PREFIX "type..map.6string.7bool"); void runtime_Fieldtrack (void *) __asm__ (GOSYM_PREFIX "runtime.Fieldtrack"); @@ -58,7 +60,7 @@ runtime_Fieldtrack (void *m) const char *prefix; size_t prefix_len; - if (__go_td_MN6_string__N4_bool == NULL) + if (map_string_bool == NULL) return; p = __data_start; @@ -107,7 +109,7 @@ runtime_Fieldtrack (void *m) s.str = (const byte *) q1; s.len = q2 - q1; - p = mapassign((const void*) __go_td_MN6_string__N4_bool, m, &s); + p = mapassign((const void*) map_string_bool, m, &s); *(_Bool*)p = 1; } -- 2.7.4