From 938d35bd4a257e6bdb74358367d21010d3fd95e2 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Tue, 28 Oct 2008 12:10:18 +0000
Subject: [PATCH] convert.c (strip_float_extensions): Do not remove or
 introduce conversions between binary and decimal...

	* convert.c (strip_float_extensions): Do not remove or introduce
	conversions between binary and decimal floating-point types.

testsuite:
	* gcc.dg/dfp/convert-bfp-12.c: New test.

From-SVN: r141407
---
 gcc/ChangeLog                             |  5 +++++
 gcc/convert.c                             |  5 ++++-
 gcc/testsuite/ChangeLog                   |  4 ++++
 gcc/testsuite/gcc.dg/dfp/convert-bfp-12.c | 17 +++++++++++++++++
 4 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/gcc.dg/dfp/convert-bfp-12.c

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d04aa06a81cc..5b520af2b09e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-28  Joseph Myers  <joseph@codesourcery.com>
+
+	* convert.c (strip_float_extensions): Do not remove or introduce
+	conversions between binary and decimal floating-point types.
+
 2008-10-28  Jakub Jelinek  <jakub@redhat.com>
 
 	PR middle-end/37931
diff --git a/gcc/convert.c b/gcc/convert.c
index 0fef3a2e7465..24617728298c 100644
--- a/gcc/convert.c
+++ b/gcc/convert.c
@@ -81,7 +81,7 @@ strip_float_extensions (tree exp)
       it properly and handle it like (type)(narrowest_type)constant.
       This way we can optimize for instance a=a*2.0 where "a" is float
       but 2.0 is double constant.  */
-  if (TREE_CODE (exp) == REAL_CST)
+  if (TREE_CODE (exp) == REAL_CST && !DECIMAL_FLOAT_TYPE_P (TREE_TYPE (exp)))
     {
       REAL_VALUE_TYPE orig;
       tree type = NULL;
@@ -108,6 +108,9 @@ strip_float_extensions (tree exp)
   if (!FLOAT_TYPE_P (subt))
     return exp;
 
+  if (DECIMAL_FLOAT_TYPE_P (expt) != DECIMAL_FLOAT_TYPE_P (subt))
+    return exp;
+
   if (TYPE_PRECISION (subt) > TYPE_PRECISION (expt))
     return exp;
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 58e7819496af..0281e865fe2f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-28  Joseph Myers  <joseph@codesourcery.com>
+
+	* gcc.dg/dfp/convert-bfp-12.c: New test.
+
 2008-10-28  Jakub Jelinek  <jakub@redhat.com>
 
 	PR middle-end/37931
diff --git a/gcc/testsuite/gcc.dg/dfp/convert-bfp-12.c b/gcc/testsuite/gcc.dg/dfp/convert-bfp-12.c
new file mode 100644
index 000000000000..96381415dce0
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/dfp/convert-bfp-12.c
@@ -0,0 +1,17 @@
+/* Test for bug where fold wrongly removed conversions to double and
+   replaced them by conversions to float.  */
+/* { dg-options "-std=gnu99" } */
+
+extern void abort (void);
+extern void exit (int);
+
+volatile float f = __builtin_inff ();
+volatile _Decimal32 d32 = 1e40DF;
+
+int
+main (void)
+{
+  if ((double) f == (double) d32)
+    abort ();
+  exit (0);
+}