From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Fri, 24 Jul 2015 18:51:13 +0000 (+0000)
Subject: compiler: Don't parse malformed receiver/parameters.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=484d5dde41d1db66e36999fe01e190adf688d417;p=gcc.git

compiler: Don't parse malformed receiver/parameters.


    Fixes golang/go#11576.

    Reviewed-on: https://go-review.googlesource.com/12157

From-SVN: r226185
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 797ec549aad..09ff6c316e7 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 113371c7b21..b7a0c3973a4 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;