From: Prathamesh Kulkarni <prathamesh.kulkarni@linaro.org>
Date: Sat, 23 May 2015 19:52:05 +0000 (+0000)
Subject: genmatch.c (parser::parse_for): Reject iterator if used as operator-list.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7523ca9b70f478b6322c98ed33056f2c7a71b17c;p=gcc.git

genmatch.c (parser::parse_for): Reject iterator if used as operator-list.

2015-05-23  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>

	* genmatch.c (parser::parse_for): Reject iterator if used as operator-list.

From-SVN: r223610
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b82d9464ccc..1d18ffd92a9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2015-05-20  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
+
+	* genmatch.c (parser::parse_for): Reject iterator if used as operator-list.
+
 2015-05-23  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
 
 	* genmatch.c (parser::parse_operator_list): Check for CPP_CLOSE_PAREN after end of id-list.
diff --git a/gcc/genmatch.c b/gcc/genmatch.c
index 4ea1cc9ee76..d1cf87215e0 100644
--- a/gcc/genmatch.c
+++ b/gcc/genmatch.c
@@ -3329,8 +3329,13 @@ parser::parse_for (source_location)
 		      "others with arity %d", oper, idb->nargs, arity);
 
 	  user_id *p = dyn_cast<user_id *> (idb);
-	  if (p && p->is_oper_list)
-	    op->substitutes.safe_splice (p->substitutes);
+	  if (p)
+	    {
+	      if (p->is_oper_list)
+		op->substitutes.safe_splice (p->substitutes);
+	      else
+		fatal_at (token, "iterator cannot be used as operator-list");
+	    }
 	  else 
 	    op->substitutes.safe_push (idb);
 	}