From: danglin <danglin@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 25 Jan 2005 02:05:39 +0000 (+0000)
Subject: 	PR middle-end/19330
X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=8061fd406c80d6b0e410a4fc7183b8e40d1b34c3

	PR middle-end/19330
	* expmed.c (extract_bit_field): Use adjust_address instead of
	gen_lowpart when op0 is a MEM.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@94198 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index baf96ff73b7..702f8ccb17f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-24  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	PR middle-end/19330
+	* expmed.c (extract_bit_field): Use adjust_address instead of
+	gen_lowpart when op0 is a MEM.
+
 2005-01-24  Steven Bosscher  <stevenb@suse.de>
 
 	* cfgexpand.c (expand_gimple_tailcall): Fix typo.
diff --git a/gcc/expmed.c b/gcc/expmed.c
index dcd77ac16ad..47b3d0db311 100644
--- a/gcc/expmed.c
+++ b/gcc/expmed.c
@@ -1158,12 +1158,18 @@ extract_bit_field (rtx str_rtx, unsigned HOST_WIDE_INT bitsize,
     enum machine_mode imode = int_mode_for_mode (GET_MODE (op0));
     if (imode != GET_MODE (op0))
       {
-	op0 = gen_lowpart (imode, op0);
+	if (MEM_P (op0))
+	  op0 = adjust_address (op0, imode, 0);
+	else
+	  {
+	    gcc_assert (imode != BLKmode);
+	    op0 = gen_lowpart (imode, op0);
 
-	/* If we got a SUBREG, force it into a register since we aren't going
-	   to be able to do another SUBREG on it.  */
-	if (GET_CODE (op0) == SUBREG)
-	  op0 = force_reg (imode, op0);
+	    /* If we got a SUBREG, force it into a register since we
+	       aren't going to be able to do another SUBREG on it.  */
+	    if (GET_CODE (op0) == SUBREG)
+	      op0 = force_reg (imode, op0);
+	  }
       }
   }