From: Kaz Kojima <kkojima@gcc.gnu.org>
Date: Sun, 5 Jun 2011 21:53:25 +0000 (+0000)
Subject: re PR target/49186 (optimize problem with unsigned long long value.)
X-Git-Tag: releases/gcc-4.4.7~374
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a13dc62afee1f42cfebc58d9ce4936f4952b38ba;p=thirdparty%2Fgcc.git

re PR target/49186 (optimize problem with unsigned long long value.)

	PR target/49186
	* config/sh/sh.c (expand_cbranchdi4): Set msw_skip when the high
	part of the second operand is 0.
	* gcc.c-torture/execute/pr49186.c: New.

From-SVN: r174667
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d4d5074a833f..3465c14cd043 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2011-06-05  Kaz Kojima  <kkojima@gcc.gnu.org>
+
+	Backport from mainline
+	2011-05-30  Kaz Kojima  <kkojima@gcc.gnu.org>
+
+	PR target/49186
+	* config/sh/sh.c (expand_cbranchdi4): Set msw_skip when the high
+	part of the second operand is 0.
+
 2011-05-29  Richard Sandiford  <rdsandiford@googlemail.com>
 
 	PR target/43700
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index 1c6e704c3a3a..9b662d3f3264 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -1600,7 +1600,10 @@ expand_cbranchdi4 (rtx *operands, enum rtx_code comparison)
 	  else if (op2h != CONST0_RTX (SImode))
 	    msw_taken = LTU;
 	  else
-	    break;
+	    {
+	      msw_skip = swap_condition (LTU);
+	      break;
+	    }
 	  msw_skip = swap_condition (msw_taken);
 	}
       break;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5b8dc062494c..d312665e9319 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2011-06-05  Kaz Kojima  <kkojima@gcc.gnu.org>
+
+	Backport from mainline
+	2011-05-30  Kaz Kojima  <kkojima@gcc.gnu.org>
+
+	PR target/49186
+	* gcc.c-torture/execute/pr49186.c: New.
+
 2011-05-29  Richard Sandiford  <rdsandiford@googlemail.com>
 
 	* gcc.target/mips/reg-var-1.c: New test.
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr49186.c b/gcc/testsuite/gcc.c-torture/execute/pr49186.c
new file mode 100644
index 000000000000..743815b98026
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/pr49186.c
@@ -0,0 +1,15 @@
+/* PR target/49186 */
+extern void abort (void);
+
+int
+main ()
+{
+  int x;
+  unsigned long long uv = 0x1000000001ULL;
+
+  x = (uv < 0x80) ? 1 : ((uv < 0x800) ? 2 : 3);
+  if (x != 3)
+    abort ();
+
+  return 0;
+}