From d3b46eb8fc59915238868e4b797dd17533824c4b Mon Sep 17 00:00:00 2001
From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 19 Feb 2018 19:16:26 +0000
Subject: [PATCH] 	PR c++/84448 	* parser.c
 (cp_parser_binary_expression): For no_toplevel_fold_p, if 	either operand
 is error_mark_node, set current.lhs to that instead of 	creating a
 binary op with error_mark_node operands.

	* g++.dg/gomp/pr84448.C: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@257821 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/cp/ChangeLog                    |  5 +++++
 gcc/cp/parser.c                     | 18 ++++++++++++------
 gcc/testsuite/ChangeLog             |  3 +++
 gcc/testsuite/g++.dg/gomp/pr84448.C | 17 +++++++++++++++++
 4 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/gomp/pr84448.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 58fc0935903..870dde6388d 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,10 @@
 2018-02-19  Jakub Jelinek  <jakub@redhat.com>
 
+	PR c++/84448
+	* parser.c (cp_parser_binary_expression): For no_toplevel_fold_p, if
+	either operand is error_mark_node, set current.lhs to that instead of
+	creating a binary op with error_mark_node operands.
+
 	PR c++/84430
 	* constexpr.c (potential_constant_expression_1): Handle OMP_SIMD.
 
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 81c6f0128e6..d8d788052ab 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -9331,12 +9331,18 @@ cp_parser_binary_expression (cp_parser* parser, bool cast_p,
 	  && lookahead_prec <= current.prec
 	  && sp == stack)
 	{
-	  current.lhs
-	    = build_min (current.tree_type,
-			 TREE_CODE_CLASS (current.tree_type) == tcc_comparison
-			 ? boolean_type_node : TREE_TYPE (current.lhs),
-			 current.lhs.get_value (), rhs.get_value ());
-	  SET_EXPR_LOCATION (current.lhs, combined_loc);
+	  if (current.lhs == error_mark_node || rhs == error_mark_node)
+	    current.lhs = error_mark_node;
+	  else
+	    {
+	      current.lhs
+		= build_min (current.tree_type,
+			     TREE_CODE_CLASS (current.tree_type)
+			     == tcc_comparison
+			     ? boolean_type_node : TREE_TYPE (current.lhs),
+			     current.lhs.get_value (), rhs.get_value ());
+	      SET_EXPR_LOCATION (current.lhs, combined_loc);
+	    }
 	}
       else
         {
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fcb1d33b8da..b4df63d9963 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2018-02-19  Jakub Jelinek  <jakub@redhat.com>
 
+	PR c++/84448
+	* g++.dg/gomp/pr84448.C: New test.
+
 	PR c++/84430
 	* g++.dg/gomp/pr84430.C: New test.
 
diff --git a/gcc/testsuite/g++.dg/gomp/pr84448.C b/gcc/testsuite/g++.dg/gomp/pr84448.C
new file mode 100644
index 00000000000..3fad4741d38
--- /dev/null
+++ b/gcc/testsuite/g++.dg/gomp/pr84448.C
@@ -0,0 +1,17 @@
+// PR c++/84448
+// { dg-do compile }
+
+struct A
+{
+  operator int () const;
+  A& operator += (int);
+  A& operator ++ ();
+};
+
+void
+foo (A a, A b)
+{
+  #pragma omp for
+  for (A i = a; i <=; ++i)	// { dg-error "expected primary-expression before" }
+    ;				// { dg-error "invalid controlling predicate" "" { target *-*-* } .-1 }
+}
-- 
2.11.4.GIT