diff options
| author | Ian Lance Taylor <iant@golang.org> | 2021-08-10 16:13:01 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2021-08-10 19:36:15 -0700 |
| commit | fed7c1634e8e50600e20cb97dbfbd74ecbd5ba22 (patch) | |
| tree | bd2062dbc843a2c220aac6de267ee6c3a28eddcd | |
| parent | 05a03f3986db25cb5076b409f4048e9dbb5dbfdf (diff) | |
compiler: don't crash on a, b := int(0)
Fixes PR go/101851
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/341330
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | gcc/go/gofrontend/expressions.cc | 15 |
2 files changed, 14 insertions, 3 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index b983fdab35c..be092de568b 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -d5d51242efc432fa62d4e9b141b01c280af32d19 +7e092d2cc5af7648036496485b639f2c9db2f2d8 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 f462b0e2a34..67917dac95d 100644 --- a/gcc/go/gofrontend/expressions.cc +++ b/gcc/go/gofrontend/expressions.cc @@ -11202,12 +11202,23 @@ Call_expression::do_lower(Gogo* gogo, Named_object* function, { Location loc = this->location(); + if (this->is_error_expression()) + return Expression::make_error(loc); + // A type cast can look like a function call. if (this->fn_->is_type_expression() && this->args_ != NULL && this->args_->size() == 1) - return Expression::make_cast(this->fn_->type(), this->args_->front(), - loc); + { + if (this->expected_result_count_ != 0 + && this->expected_result_count_ != 1) + { + this->report_error(_("type conversion result count mismatch")); + return Expression::make_error(loc); + } + return Expression::make_cast(this->fn_->type(), this->args_->front(), + loc); + } // Because do_type will return an error type and thus prevent future // errors, check for that case now to ensure that the error gets |