diff options
Diffstat (limited to 'gcc/go')
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | gcc/go/gofrontend/expressions.cc | 8 | ||||
| -rw-r--r-- | gcc/go/gofrontend/statements.cc | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index c150747..f21c43a 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -1cb26dc898bda1e85f4dd2ee204adbce792e4813 +e069d4417a692c1261df99fe3323277e1a0193d2 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/gcc/go/gofrontend/expressions.cc b/gcc/go/gofrontend/expressions.cc index 542f3de..7ad271f 100644 --- a/gcc/go/gofrontend/expressions.cc +++ b/gcc/go/gofrontend/expressions.cc @@ -13502,9 +13502,14 @@ Expression::make_heap_expression(Expression* expr, Location location) Type* Receive_expression::do_type() { + if (this->is_error_expression()) + return Type::make_error_type(); Channel_type* channel_type = this->channel_->type()->channel_type(); if (channel_type == NULL) - return Type::make_error_type(); + { + this->report_error(_("expected channel")); + return Type::make_error_type(); + } return channel_type->element_type(); } @@ -13516,6 +13521,7 @@ Receive_expression::do_check_types(Gogo*) Type* type = this->channel_->type(); if (type->is_error()) { + go_assert(saw_errors()); this->set_is_error(); return; } diff --git a/gcc/go/gofrontend/statements.cc b/gcc/go/gofrontend/statements.cc index 5d102bf..a84203a 100644 --- a/gcc/go/gofrontend/statements.cc +++ b/gcc/go/gofrontend/statements.cc @@ -3856,7 +3856,10 @@ Switch_statement::do_lower(Gogo*, Named_object*, Block* enclosing, if (this->val_ != NULL && (this->val_->is_error_expression() || this->val_->type()->is_error())) - return Statement::make_error_statement(loc); + { + go_assert(saw_errors()); + return Statement::make_error_statement(loc); + } if (this->val_ != NULL && this->val_->type()->integer_type() != NULL |