mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-09 21:31:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't crash building map descriptor for erroneous map.

Browse Source 
From-SVN: r168197
This commit is contained in:
Ian Lance Taylor 2010-12-23 01:22:32 +00:00
parent 42471ba917
commit 9d65de2123
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/go/gofrontend/gogo-tree.cc
View File

@ -2356,6 +2356,8 @@ Gogo::map_descriptor(Map_type* maptype)
Map_descriptors::iterator p = ins.first;
if (!ins.second)
{
if (p->second == error_mark_node)
return error_mark_node;
gcc_assert(p->second != NULL_TREE && DECL_P(p->second));
return build_fold_addr_expr(p->second);
}
@ -2385,7 +2387,10 @@ Gogo::map_descriptor(Map_type* maptype)
"__val",
valtype->get_tree(this));
if (map_entry_type == error_mark_node)
return error_mark_node;
{
p->second = error_mark_node;
return error_mark_node;
}
tree map_entry_key_field = DECL_CHAIN(TYPE_FIELDS(map_entry_type));
gcc_assert(strcmp(IDENTIFIER_POINTER(DECL_NAME(map_entry_key_field)),