From 7d293b587a78e9a779620da1519fab0c577de19a Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 29 Oct 2008 17:07:39 +0100 Subject: [PATCH] re PR middle-end/37870 (ICE in extract_bit_field_1) PR middle-end/37870 * expmed.c (extract_bit_field_1): If int_mode_for_mode returns BLKmode for non-memory, convert using a wider MODE_INT mode or through memory. * gcc.target/i386/pr37870.c: New test. From-SVN: r141430 --- gcc/ChangeLog | 5 +++++ gcc/expmed.c | 23 +++++++++++++++++--- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.target/i386/pr37870.c | 29 +++++++++++++++++++++++++ 4 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.target/i386/pr37870.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3168826c8ce..44836d5db65 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2008-10-29 Jakub Jelinek + PR middle-end/37870 + * expmed.c (extract_bit_field_1): If int_mode_for_mode returns + BLKmode for non-memory, convert using a wider MODE_INT mode + or through memory. + PR middle-end/37913 * tree-cfgcleanup.c (split_bbs_on_noreturn_calls): Only split bbs that haven't been removed yet. diff --git a/gcc/expmed.c b/gcc/expmed.c index 5e8d7f30324..0c7e611e188 100644 --- a/gcc/expmed.c +++ b/gcc/expmed.c @@ -1,7 +1,7 @@ /* Medium-level subroutines: convert bit-field store and extract and shifts, multiplies and divides to rtl instructions. Copyright (C) 1987, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This file is part of GCC. @@ -1278,9 +1278,8 @@ extract_bit_field_1 (rtx str_rtx, unsigned HOST_WIDE_INT bitsize, { if (MEM_P (op0)) op0 = adjust_address (op0, imode, 0); - else + else if (imode != BLKmode) { - gcc_assert (imode != BLKmode); op0 = gen_lowpart (imode, op0); /* If we got a SUBREG, force it into a register since we @@ -1288,6 +1287,24 @@ extract_bit_field_1 (rtx str_rtx, unsigned HOST_WIDE_INT bitsize, if (GET_CODE (op0) == SUBREG) op0 = force_reg (imode, op0); } + else if (REG_P (op0)) + { + rtx reg, subreg; + imode = smallest_mode_for_size (GET_MODE_BITSIZE (GET_MODE (op0)), + MODE_INT); + reg = gen_reg_rtx (imode); + subreg = gen_lowpart_SUBREG (GET_MODE (op0), reg); + emit_move_insn (subreg, op0); + op0 = reg; + bitnum += SUBREG_BYTE (subreg) * BITS_PER_UNIT; + } + else + { + rtx mem = assign_stack_temp (GET_MODE (op0), + GET_MODE_SIZE (GET_MODE (op0)), 0); + emit_move_insn (mem, op0); + op0 = adjust_address (mem, BLKmode, 0); + } } } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2a863f3cb47..070840147c8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-10-29 Jakub Jelinek + + PR middle-end/37870 + * gcc.target/i386/pr37870.c: New test. + 2008-10-29 Manuel López-Ibáñez PR c++/26997 diff --git a/gcc/testsuite/gcc.target/i386/pr37870.c b/gcc/testsuite/gcc.target/i386/pr37870.c new file mode 100644 index 00000000000..19cfb205865 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr37870.c @@ -0,0 +1,29 @@ +/* PR middle-end/37870 */ +/* { dg-do run } */ +/* { dg-options "-O2" } */ + +unsigned int +foo (long double x) +{ + struct { char a[8]; unsigned int b:7; } c; + __builtin_memcpy (&c, &x, sizeof (c)); + return c.b; +} + +unsigned int +bar (long double x) +{ + union { struct { char a[8]; unsigned int b:7; } c; long double d; } u; + u.d = x; + return u.c.b; +} + +int +main (void) +{ + if (foo (1.245L) != bar (1.245L) + || foo (245.67L) != bar (245.67L) + || foo (0.00567L) != bar (0.00567L)) + __builtin_abort (); + return 0; +} -- 2.30.2