diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2010-12-21 06:13:14 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2010-12-21 06:13:14 +0000 |
| commit | 5ae2ca96ad36d168af9e4dcb23d76fa5be1662fe (patch) | |
| tree | 86fa2c10054e71197cdcaa139c51829167f7b92d | |
| parent | bc77e3e1610f6392b56a7175ac56408760ddbedf (diff) | |
| download | gcc-5ae2ca96ad36d168af9e4dcb23d76fa5be1662fe.zip gcc-5ae2ca96ad36d168af9e4dcb23d76fa5be1662fe.tar.gz gcc-5ae2ca96ad36d168af9e4dcb23d76fa5be1662fe.tar.bz2 | |
Don't crash on invalid return statement.
From-SVN: r168102
| -rw-r--r-- | gcc/go/gofrontend/statements.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gcc/go/gofrontend/statements.cc b/gcc/go/gofrontend/statements.cc index 2c0dba0..97b8955 100644 --- a/gcc/go/gofrontend/statements.cc +++ b/gcc/go/gofrontend/statements.cc @@ -2567,6 +2567,8 @@ Return_statement::do_get_tree(Translate_context* context) { Function* function = context->function()->func_value(); tree fndecl = function->get_decl(); + if (fndecl == error_mark_node || DECL_RESULT(fndecl) == error_mark_node) + return error_mark_node; const Typed_identifier_list* results = this->results_; @@ -2580,6 +2582,8 @@ Return_statement::do_get_tree(Translate_context* context) tree set; if (retval == NULL_TREE) set = NULL_TREE; + else if (retval == error_mark_node) + return error_mark_node; else set = fold_build2_loc(this->location(), MODIFY_EXPR, void_type_node, DECL_RESULT(fndecl), retval); @@ -2591,13 +2595,13 @@ Return_statement::do_get_tree(Translate_context* context) { gcc_assert(!VOID_TYPE_P(TREE_TYPE(TREE_TYPE(fndecl)))); tree val = (*this->vals_->begin())->get_tree(context); - if (val == error_mark_node) - return error_mark_node; gcc_assert(results != NULL && results->size() == 1); val = Expression::convert_for_assignment(context, results->begin()->type(), (*this->vals_->begin())->type(), val, this->location()); + if (val == error_mark_node) + return error_mark_node; tree set = build2(MODIFY_EXPR, void_type_node, DECL_RESULT(fndecl), val); SET_EXPR_LOCATION(set, this->location()); @@ -2618,11 +2622,11 @@ Return_statement::do_get_tree(Translate_context* context) { gcc_assert(pv != this->vals_->end()); tree val = (*pv)->get_tree(context); - if (val == error_mark_node) - return error_mark_node; val = Expression::convert_for_assignment(context, pr->type(), (*pv)->type(), val, this->location()); + if (val == error_mark_node) + return error_mark_node; tree set = build2(MODIFY_EXPR, void_type_node, build3(COMPONENT_REF, TREE_TYPE(field), retvar, field, NULL_TREE), |