From: Eric Botcazou <ebotcazou@adacore.com>
Date: Sun, 28 Sep 2008 15:15:16 +0000 (+0000)
Subject: re PR middle-end/36575 (ACATS c460011 fails at -O3)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b72ae442070ce80e69e78845b399b3d686d381e;p=thirdparty%2Fgcc.git

re PR middle-end/36575 (ACATS c460011 fails at -O3)

	PR middle-end/36575
	* fold-const (div_and_round_double) <ROUND_DIV_EXPR>: Fix typo.

From-SVN: r140736
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3bf0db753337..2c314e3e6602 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-28  Eric Botcazou  <ebotcazou@adacore.com>
+
+	PR middle-end/36575
+	* fold-const (div_and_round_double) <ROUND_DIV_EXPR>: Fix typo.
+
 2008-09-19  Uros Bizjak  <ubizjak@gmail.com>
 
 	Backport from mainline:
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 4a1cc2c97217..059496e4882d 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -816,7 +816,7 @@ div_and_round_double (enum tree_code code, int uns,
 	if (hden < 0)
 	  neg_double (lden, hden, &labs_den, &habs_den);
 
-	/* If (2 * abs (lrem) >= abs (lden)) */
+	/* If (2 * abs (lrem) >= abs (lden)), adjust the quotient.  */
 	mul_double ((HOST_WIDE_INT) 2, (HOST_WIDE_INT) 0,
 		    labs_rem, habs_rem, &ltwice, &htwice);
 
@@ -824,7 +824,7 @@ div_and_round_double (enum tree_code code, int uns,
 	     < (unsigned HOST_WIDE_INT) htwice)
 	    || (((unsigned HOST_WIDE_INT) habs_den
 		 == (unsigned HOST_WIDE_INT) htwice)
-		&& (labs_den < ltwice)))
+		&& (labs_den <= ltwice)))
 	  {
 	    if (*hquo < 0)
 	      /* quo = quo - 1;  */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index cc306b59e0f7..8f400bc47acb 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-28  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gnat.dg/conv_decimal.adb: New test.
+
 2008-09-19  Uros Bizjak  <ubizjak@gmail.com>
 
 	Backport from mainline:
diff --git a/gcc/testsuite/gnat.dg/conv_decimal.adb b/gcc/testsuite/gnat.dg/conv_decimal.adb
new file mode 100644
index 000000000000..d5199c1b48b9
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/conv_decimal.adb
@@ -0,0 +1,34 @@
+-- PR middle-end/36575
+-- reporter: Laurent Guerby <laurent@guerby.net>
+-- { dg-do run }
+
+procedure Conv_Decimal is
+
+  type Unsigned_Over_8 is mod 2**8+2;
+  type Signed_Over_8 is range -200 .. 200;
+
+  procedure Assert(Truth: Boolean) is
+  begin
+    if not Truth then
+      raise Program_Error;
+    end if;
+  end;
+
+  type Decim is delta 0.1 digits 5;
+
+  Halfway  : Decim := 2.5;
+  Neg_Half : Decim := -2.5;
+
+  Big      : Unsigned_Over_8;
+  Also_Big : Signed_Over_8;
+
+begin
+  Big := Unsigned_Over_8 (Halfway); -- Rounds up by 4.6(33).
+  Assert(Big = 3);
+
+  Also_Big := Signed_Over_8 (Halfway); -- Rounds up by 4.6(33).
+  Assert(Also_Big = 3);
+
+  Also_Big := Signed_Over_8 (Neg_Half); -- Rounds down by 4.6(33).
+  Assert(Also_Big = -3);
+end;