c-common.c (shorten_compare): Do not shorten mixed DFP and non-DFP compares.

2014-11-04  Richard Biener  <rguenther@suse.de>

	* c-common.c (shorten_compare): Do not shorten mixed
	DFP and non-DFP compares.

From-SVN: r217101

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index a28ef60b98461f1abb886bf66adebf6a2f31e600..861ba073f3588c72a657b951bb7bd3b5cc0eb4e0 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-04  Richard Biener  <rguenther@suse.de>
+
+       * c-common.c (shorten_compare): Do not shorten mixed
+       DFP and non-DFP compares.
+
 2014-11-01  Edward Smith-Rowland  <3dw4rd@verizon.net>
 
        * g++.dg/cpp1y/feat-cxx11.C: Commentary and rearrangement of tests.

diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index 03137febc080c91cb4faa2caf3bda12b19213205..532923cb798b52a3d3866b842eb693cbbf57ad6c 100644 (file)
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -4313,10 +4313,16 @@ shorten_compare (location_t loc, tree *op0_ptr, tree *op1_ptr,
 
   /* If either arg is decimal float and the other is float, find the
      proper common type to use for comparison.  */
+  else if (real1 && real2
+          && DECIMAL_FLOAT_MODE_P (TYPE_MODE (TREE_TYPE (primop0)))
+          && DECIMAL_FLOAT_MODE_P (TYPE_MODE (TREE_TYPE (primop1))))
+    type = common_type (TREE_TYPE (primop0), TREE_TYPE (primop1));
+
+  /* If either arg is decimal float and the other is float, fail.  */
   else if (real1 && real2
           && (DECIMAL_FLOAT_MODE_P (TYPE_MODE (TREE_TYPE (primop0)))
               || DECIMAL_FLOAT_MODE_P (TYPE_MODE (TREE_TYPE (primop1)))))
-    type = common_type (TREE_TYPE (primop0), TREE_TYPE (primop1));
+    return 0;
 
   else if (real1 && real2
           && (TYPE_PRECISION (TREE_TYPE (primop0))