diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2015-07-24 18:51:13 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2015-07-24 18:51:13 +0000 |
| commit | 484d5dde41d1db66e36999fe01e190adf688d417 (patch) | |
| tree | ac8f684b23b3817da2a917101ba186f29464439e /gcc | |
| parent | 37aa341d9dffe66a784d3d1453042e9e7d315ec9 (diff) | |
| download | gcc-484d5dde41d1db66e36999fe01e190adf688d417.zip gcc-484d5dde41d1db66e36999fe01e190adf688d417.tar.gz gcc-484d5dde41d1db66e36999fe01e190adf688d417.tar.bz2 | |
compiler: Don't parse malformed receiver/parameters.
Fixes golang/go#11576.
Reviewed-on: https://go-review.googlesource.com/12157
From-SVN: r226185
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | gcc/go/gofrontend/parse.cc | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 797ec54..09ff6c3 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -46117382a58843af60fc2feab68c433a96f79e79 +e4a5e2b2a9dc556685db09421a95871f195f768b 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/parse.cc b/gcc/go/gofrontend/parse.cc index 113371c..b7a0c39 100644 --- a/gcc/go/gofrontend/parse.cc +++ b/gcc/go/gofrontend/parse.cc @@ -787,9 +787,11 @@ Parse::parameters(Typed_identifier_list** pparams, bool* is_varargs) // The optional trailing comma is picked up in parameter_list. if (!token->is_op(OPERATOR_RPAREN)) - error_at(this->location(), "expected %<)%>"); - else - this->advance_token(); + { + error_at(this->location(), "expected %<)%>"); + return false; + } + this->advance_token(); if (saw_error) return false; |