diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2010-12-22 00:00:42 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2010-12-22 00:00:42 +0000 |
| commit | 0cc3d14ec1545d5feb65396bc7915e1795fb2894 (patch) | |
| tree | 95fe75c5743fe19da36a4a19157c472b4dfd84d5 | |
| parent | 522c4f1f1ee54615bac9da3973d7fa719161a0c3 (diff) | |
| download | gcc-0cc3d14ec1545d5feb65396bc7915e1795fb2894.zip gcc-0cc3d14ec1545d5feb65396bc7915e1795fb2894.tar.gz gcc-0cc3d14ec1545d5feb65396bc7915e1795fb2894.tar.bz2 | |
Check for errors when building map construction.
From-SVN: r168148
| -rw-r--r-- | gcc/go/gofrontend/expressions.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/expressions.cc b/gcc/go/gofrontend/expressions.cc index faea908..10aedde 100644 --- a/gcc/go/gofrontend/expressions.cc +++ b/gcc/go/gofrontend/expressions.cc @@ -11181,13 +11181,19 @@ Map_construction_expression::do_get_tree(Translate_context* context) Type* key_type = mt->key_type(); 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; TYPE_FIELDS(struct_type) = key_field; Type* val_type = mt->val_type(); 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_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 type_tree = this->type_->get_tree(gogo); + if (type_tree == error_mark_node) + return error_mark_node; static tree construct_map_fndecl; tree call = Gogo::call_builtin(&construct_map_fndecl, |