From f367b3d45cd131315a8b1777df4fd12e83eae1f3 Mon Sep 17 00:00:00 2001 From: rguenth Date: Wed, 20 May 2009 08:19:50 +0000 Subject: [PATCH] 2009-05-20 Richard Guenther * expr.c (expand_expr_real_1): Avoid calling do_store_flag with mismatched comparison modes. * gcc.c-torture/compile/20090518-1.c: New testcase. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@147731 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++++ gcc/expr.c | 7 ++++++- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gcc.c-torture/compile/20090518-1.c | 6 ++++++ 4 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.c-torture/compile/20090518-1.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b64bdcef28b..19a59b5704b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2009-05-20 Richard Guenther + + * expr.c (expand_expr_real_1): Avoid calling do_store_flag + with mismatched comparison modes. + 2009-05-20 Ramana Radhakrishnan * config/arm/arm.md (*arm_iorsi3): Refactored for only ARM. diff --git a/gcc/expr.c b/gcc/expr.c index aca8c578c8e..73fde710d80 100644 --- a/gcc/expr.c +++ b/gcc/expr.c @@ -9042,7 +9042,12 @@ expand_expr_real_1 (tree exp, rtx target, enum machine_mode tmode, case LTGT_EXPR: temp = do_store_flag (exp, modifier != EXPAND_STACK_PARM ? target : NULL_RTX, - tmode != VOIDmode ? tmode : mode); + (tmode != VOIDmode + /* do_store_flag does not handle target modes + of a different class than the comparison mode. + Avoid ICEing in convert_move. */ + && GET_MODE_CLASS (tmode) == GET_MODE_CLASS (mode)) + ? tmode : mode); if (temp != 0) return temp; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6b462b668ca..cca56e5c0db 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2009-05-20 Richard Guenther + + * gcc.c-torture/compile/20090518-1.c: New testcase. + 2009-05-19 Zdenek Dvorak PR tree-optimization/40087 diff --git a/gcc/testsuite/gcc.c-torture/compile/20090518-1.c b/gcc/testsuite/gcc.c-torture/compile/20090518-1.c new file mode 100644 index 00000000000..709504c405a --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/20090518-1.c @@ -0,0 +1,6 @@ +float +foo(int i) +{ + int j = i == 42; + return *(float *)&j; +} -- 2.11.0