From: Andrew Pinski <apinski@marvell.com>
Date: Sun, 27 Jun 2021 20:14:48 +0000 (-0700)
Subject: Fix PR 101230: ICE in fold_cond_expr_with_comparison
X-Git-Tag: basepoints/gcc-13~6481
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37ad257c06d88fdb810be336d212c1ab54b99dad;p=thirdparty%2Fgcc.git

Fix PR 101230: ICE in fold_cond_expr_with_comparison

This fixes PR 101230 where I had messed up and forgot that
invert_tree_comparison can return ERROR_MARK if the comparsion
is not invertable (floating point types).

Committed as obvious after a bootstrap/test on x86_64-linux-gnu-gnu

gcc/ChangeLog:

	PR middle-end/101230
	* fold-const.c (fold_ternary_loc): Check
	the return value of invert_tree_comparison.

gcc/testsuite/ChangeLog:

	* gcc.dg/torture/pr101230-1.c: New test.
---

diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index e2110b6bffe8..dfccbaec6838 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -12837,10 +12837,11 @@ fold_ternary_loc (location_t loc, enum tree_code code, tree type,
 	  tree arg00 = TREE_OPERAND (arg0, 0);
 	  tree arg01 = TREE_OPERAND (arg0, 1);
 	  comp_code = invert_tree_comparison (comp_code, HONOR_NANS (arg00));
-	  tem = fold_cond_expr_with_comparison (loc, type, comp_code,
-						arg00,
-						arg01,
-						op2, op1);
+	  if (comp_code != ERROR_MARK)
+	    tem = fold_cond_expr_with_comparison (loc, type, comp_code,
+						  arg00,
+						  arg01,
+						  op2, op1);
 	  if (tem)
 	    return tem;
 	}
diff --git a/gcc/testsuite/gcc.dg/torture/pr101230-1.c b/gcc/testsuite/gcc.dg/torture/pr101230-1.c
new file mode 100644
index 000000000000..f10ca8b1f499
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr101230-1.c
@@ -0,0 +1,15 @@
+/* { dg-do compile } */
+/* { dg-additional-options "-fno-signed-zeros" } */
+
+
+double distance3d_sqr_pt4d_pt4d(void);
+
+int update_r_k_curr_cluster;
+void update_r_k(void) {
+  double curr_distance = distance3d_sqr_pt4d_pt4d();
+  for (int cluster; cluster; cluster++)
+    if (0 < curr_distance) {
+      curr_distance = 0;
+      update_r_k_curr_cluster = cluster;
+    }
+}