diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2010-12-22 01:14:41 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2010-12-22 01:14:41 +0000 |
| commit | 11d6fcc2c4671b4e8689e1d3cb3b7fc0d216112d (patch) | |
| tree | 3ddd85c5babcfe0d92f9f8ae754208483ce0e359 /gcc | |
| parent | fe6e051695ff13ec7139469402506deb66ba0420 (diff) | |
| download | gcc-11d6fcc2c4671b4e8689e1d3cb3b7fc0d216112d.zip gcc-11d6fcc2c4671b4e8689e1d3cb3b7fc0d216112d.tar.gz gcc-11d6fcc2c4671b4e8689e1d3cb3b7fc0d216112d.tar.bz2 | |
Don't crash building erroneous variable initializer.
From-SVN: r168155
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/go/gofrontend/gogo-tree.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/gcc/go/gofrontend/gogo-tree.cc b/gcc/go/gofrontend/gogo-tree.cc index e43f64d..5a6f079 100644 --- a/gcc/go/gofrontend/gogo-tree.cc +++ b/gcc/go/gofrontend/gogo-tree.cc @@ -757,7 +757,7 @@ Gogo::write_globals() pop_cfun(); } - if (var_init_tree != NULL_TREE) + if (var_init_tree != NULL_TREE && var_init_tree != error_mark_node) { if (no->var_value()->init() == NULL && !no->var_value()->has_pre_init()) @@ -1209,10 +1209,13 @@ Variable::get_init_block(Gogo* gogo, Named_object* function, tree var_decl) Translate_context context(gogo, function, NULL, NULL_TREE); tree block_tree = this->preinit_->get_tree(&context); + if (block_tree == error_mark_node) + return error_mark_node; gcc_assert(TREE_CODE(block_tree) == BIND_EXPR); tree statements = BIND_EXPR_BODY(block_tree); - while (TREE_CODE(statements) == TRY_FINALLY_EXPR - || TREE_CODE(statements) == TRY_CATCH_EXPR) + while (statements != NULL_TREE + && (TREE_CODE(statements) == TRY_FINALLY_EXPR + || TREE_CODE(statements) == TRY_CATCH_EXPR)) statements = TREE_OPERAND(statements, 0); // It's possible to have pre-init statements without an initializer @@ -1220,6 +1223,8 @@ Variable::get_init_block(Gogo* gogo, Named_object* function, tree var_decl) if (this->init_ != NULL) { tree rhs_tree = this->init_->get_tree(&context); + if (rhs_tree == error_mark_node) + return error_mark_node; if (var_decl == NULL_TREE) append_to_statement_list(rhs_tree, &statements); else @@ -1228,6 +1233,8 @@ Variable::get_init_block(Gogo* gogo, Named_object* function, tree var_decl) this->init_->type(), rhs_tree, this->location()); + if (val == error_mark_node) + return error_mark_node; tree set = fold_build2_loc(this->location(), MODIFY_EXPR, void_type_node, var_decl, val); append_to_statement_list(set, &statements); |