git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Check for errors when building map construction. 

From-SVN: r168148
This commit is contained in:
Ian Lance Taylor 2010-12-22 00:00:42 +00:00
parent 522c4f1f1e
commit 0cc3d14ec1
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gcc/go/gofrontend/expressions.cc
View File

@ -11181,13 +11181,19 @@ Map_construction_expression::do_get_tree(Translate_context* context)
Type* key_type = mt->key_type(); Type* key_type = mt->key_type();
tree id = get_identifier("__key"); tree id = get_identifier("__key");
tree key_field = build_decl(loc, FIELD_DECL, id, key_type->get_tree(gogo)); tree key_type_tree = key_type->get_tree(gogo);
if (key_type_tree == error_mark_node)
return error_mark_node;
tree key_field = build_decl(loc, FIELD_DECL, id, key_type_tree);
DECL_CONTEXT(key_field) = struct_type; DECL_CONTEXT(key_field) = struct_type;
TYPE_FIELDS(struct_type) = key_field; TYPE_FIELDS(struct_type) = key_field;
Type* val_type = mt->val_type(); Type* val_type = mt->val_type();
id = get_identifier("__val"); id = get_identifier("__val");
tree val_field = build_decl(loc, FIELD_DECL, id, val_type->get_tree(gogo)); tree val_type_tree = val_type->get_tree(gogo);
if (val_type_tree == error_mark_node)
return error_mark_node;
tree val_field = build_decl(loc, FIELD_DECL, id, val_type_tree);
DECL_CONTEXT(val_field) = struct_type; DECL_CONTEXT(val_field) = struct_type;
DECL_CHAIN(key_field) = val_field; DECL_CHAIN(key_field) = val_field;
@ -11288,6 +11294,8 @@ Map_construction_expression::do_get_tree(Translate_context* context)
tree descriptor = gogo->map_descriptor(mt); tree descriptor = gogo->map_descriptor(mt);
tree type_tree = this->type_->get_tree(gogo); tree type_tree = this->type_->get_tree(gogo);
if (type_tree == error_mark_node)
return error_mark_node;
static tree construct_map_fndecl; static tree construct_map_fndecl;
tree call = Gogo::call_builtin(&construct_map_fndecl, tree call = Gogo::call_builtin(&construct_map_fndecl,