From 8e285338d90671900b85823f960ab0fbbcb87b37 Mon Sep 17 00:00:00 2001 From: Kaz Kojima Date: Sun, 5 Jun 2011 21:50:29 +0000 Subject: [PATCH] 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: r174666 --- gcc/ChangeLog | 9 +++++++++ gcc/config/sh/sh.c | 5 ++++- gcc/testsuite/ChangeLog | 8 ++++++++ gcc/testsuite/gcc.c-torture/execute/pr49186.c | 15 +++++++++++++++ 4 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.c-torture/execute/pr49186.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bfb35c908d89..d0e23893d66d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2011-06-05 Kaz Kojima + + Backport from mainline + 2011-05-30 Kaz Kojima + + PR target/49186 + * config/sh/sh.c (expand_cbranchdi4): Set msw_skip when the high + part of the second operand is 0. + 2011-06-04 Ira Rosen PR tree-optimization/49038 diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c index f06f4fd83d0d..5ee090c192f2 100644 --- a/gcc/config/sh/sh.c +++ b/gcc/config/sh/sh.c @@ -1945,7 +1945,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 87edb9e49180..f0a88d93b8cc 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2011-06-05 Kaz Kojima + + Backport from mainline + 2011-05-30 Kaz Kojima + + PR target/49186 + * gcc.c-torture/execute/pr49186.c: New. + 2011-06-04 Ira Rosen PR tree-optimization/49038 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; +} -- 2.47.2