OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Ian Lance Taylor 2018-01-31 18:25:17 +00:00
parent 382ce98374
commit 9734500e9b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gcc/go/gofrontend/MERGE
View File

@ -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.

8
libgo/runtime/go-fieldtrack.c
View File

@ -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;
}