From: Jakub Jelinek <jakub@gcc.gnu.org>
Date: Mon, 12 Dec 2011 18:55:06 +0000 (+0100)
Subject: re PR c++/51496 (FAIL: libgomp.c++/for-2.C  *  (test for excess errors))
X-Git-Tag: releases/gcc-4.7.0~1594
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=007db66070dd022993de34ab2c9f880b4d5678cb;p=thirdparty%2Fgcc.git

re PR c++/51496 (FAIL: libgomp.c++/for-2.C  *  (test for excess errors))

	PR c++/51496
	* parser.c (cp_parser_omp_for_loop): When determining whether
	to use cp_parser_omp_for_incr or cp_parser_expression and when
	calling cp_parser_omp_for_incr, use real_decl instead of decl.

From-SVN: r182257
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7db2598b3f3f..3f04054cd8a4 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2011-12-12  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/51496
+	* parser.c (cp_parser_omp_for_loop): When determining whether
+	to use cp_parser_omp_for_incr or cp_parser_expression and when
+	calling cp_parser_omp_for_incr, use real_decl instead of decl.
+
 2011-12-12  Torvald Riegel  <triegel@redhat.com>
 
 	* semantics.c (finish_transaction_stmt, build_transaction_expr):
@@ -9,7 +16,7 @@
 	(cp_parser_noexcept_specification_opt): ...here.  Allow for parsing
 	non-constexpr noexcept arguments.
 	(cp_parser_transaction, cp_parser_transaction_expression): Parse
-    and handle noexcept-specifications.
+	and handle noexcept-specifications.
 	(cp_parser_function_transaction): Adapt to finish_transaction_stmt
 	change.
 	* pt.c (tsubst_expr): Adapt to new noexcept parameters when
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index a0aa2a1a4f7c..2bd91ec96561 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -26354,11 +26354,11 @@ cp_parser_omp_for_loop (cp_parser *parser, tree clauses, tree *par_clauses)
 	{
 	  /* If decl is an iterator, preserve the operator on decl
 	     until finish_omp_for.  */
-	  if (decl
+	  if (real_decl
 	      && ((processing_template_decl
-		   && !POINTER_TYPE_P (TREE_TYPE (decl)))
-		  || CLASS_TYPE_P (TREE_TYPE (decl))))
-	    incr = cp_parser_omp_for_incr (parser, decl);
+		   && !POINTER_TYPE_P (TREE_TYPE (real_decl)))
+		  || CLASS_TYPE_P (TREE_TYPE (real_decl))))
+	    incr = cp_parser_omp_for_incr (parser, real_decl);
 	  else
 	    incr = cp_parser_expression (parser, false, NULL);
 	}