* cp-gimplify.c (cp_gimplify_expr): Fix error recovery.

From-SVN: r156803

* cp-gimplify.c (cp_gimplify_expr): Fix error recovery.
From-SVN: r156803
0d08582e · Jason Merrill · Jason Merrill · 99f51320 · 0d08582e · 0d08582e
Commit 0d08582e authored Feb 16, 2010 by Jason Merrill Committed by Jason Merrill Feb 16, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

gcc/cp/ChangeLog
+2 -0

gcc/cp/cp-gimplify.c
+4 -2

No files found.
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
 2010-02-16  Jason Merrill  <jason@redhat.com>

+	* cp-gimplify.c (cp_gimplify_expr): Fix error recovery.
+
 	PR c++/43031
 	* cp-gimplify.c (cp_gimplify_expr) [MODIFY_EXPR]: Use
 	VIEW_CONVERT_EXPR for conversions between structural equality types

--- a/gcc/cp/cp-gimplify.c
+++ b/gcc/cp/cp-gimplify.c
@@ -560,8 +560,10 @@ cp_gimplify_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p)
 	tree op0 = TREE_OPERAND (*expr_p, 0);
 	tree op1 = TREE_OPERAND (*expr_p, 1);

-	if ((TYPE_STRUCTURAL_EQUALITY_P (TREE_TYPE (op0))
-	     || TYPE_STRUCTURAL_EQUALITY_P (TREE_TYPE (op1)))
+	if (!error_operand_p (op0)
+	    && !error_operand_p (op1)
+	    && (TYPE_STRUCTURAL_EQUALITY_P (TREE_TYPE (op0))
+		|| TYPE_STRUCTURAL_EQUALITY_P (TREE_TYPE (op1)))
 	    && !useless_type_conversion_p (TREE_TYPE (op1), TREE_TYPE (op0)))
 	  TREE_OPERAND (*expr_p, 1) = build1 (VIEW_CONVERT_EXPR,
 					      TREE_TYPE (op0), op1);