From ea81e5c7d0639c57a1cda2c49ee86c8aa501222f Mon Sep 17 00:00:00 2001 From: jakub Date: Mon, 3 May 2010 15:42:43 +0000 Subject: [PATCH] PR debug/43972 * config/i386/i386.c (ix86_delegitimize_address): Make sure the result mode matches original rtl mode. * gcc.dg/debug/pr43972.c: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@158989 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/config/i386/i386.c | 7 ++++++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/debug/pr43972.c | 29 ++++++++++++++++++++++++++++ 4 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/debug/pr43972.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3390faec5979..e62e9ab3d3bc 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2010-05-03 Jakub Jelinek + + PR debug/43972 + * config/i386/i386.c (ix86_delegitimize_address): Make sure the + result mode matches original rtl mode. + 2010-05-03 Dave Korn PR target/43888 diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 10aac6e4e7be..e05d3cc08c46 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -11014,7 +11014,10 @@ ix86_delegitimize_address (rtx x) || XINT (XEXP (x, 0), 1) != UNSPEC_GOTPCREL || !MEM_P (orig_x)) return orig_x; - return XVECEXP (XEXP (x, 0), 0, 0); + x = XVECEXP (XEXP (x, 0), 0, 0); + if (GET_MODE (orig_x) != Pmode) + return simplify_gen_subreg (GET_MODE (orig_x), x, Pmode, 0); + return x; } if (GET_CODE (x) != PLUS @@ -11081,6 +11084,8 @@ ix86_delegitimize_address (rtx x) else return orig_x; } + if (GET_MODE (orig_x) != Pmode && MEM_P (orig_x)) + return simplify_gen_subreg (GET_MODE (orig_x), result, Pmode, 0); return result; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8eaae92a975e..5fe4b1d86161 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-05-03 Jakub Jelinek + + PR debug/43972 + * gcc.dg/debug/pr43972.c: New test. + 2010-05-02 Uros Bizjak PR testsuite/43963 diff --git a/gcc/testsuite/gcc.dg/debug/pr43972.c b/gcc/testsuite/gcc.dg/debug/pr43972.c new file mode 100644 index 000000000000..5fcf1e0e87fb --- /dev/null +++ b/gcc/testsuite/gcc.dg/debug/pr43972.c @@ -0,0 +1,29 @@ +/* PR debug/43972 */ +/* { dg-do compile } */ +/* { dg-options "-g -w" } */ +/* { dg-options "-g -fpic -w" { target fpic } } */ + +struct { int *b1; } *f1 (); +short v1[1]; +struct S { int b2; }; +void +foo (struct S *a1, union { char *b3; unsigned *b4; int *b5; } *a2) +{ + int d; + switch (d) + { + case 0: + { + int c = a1->b2, i; + if (f1 () == 0) + *a2->b3++ = 2; + else if (((long) (f1 () - f1 ())) ^ ((long) f1 ()->b1 - ((long) f1 () & 8))) + *a2->b3++ = (long) f1 - ((long) f1 () & 0xff); + else + *a2->b4++ = (long) f1; + for (i = 0; i < c; i++) + *a2->b5++ = (long) v1; + foo (a1, a2); + } + } +} -- 2.47.2