From: Jakub Jelinek <jakub@redhat.com>
Date: Sat, 3 Jan 2009 21:11:30 +0000 (+0100)
Subject: re PR target/38707 (gcc.c-torture/execute/20050121-1.c ICEs with -march=pentium-m)
X-Git-Tag: releases/gcc-4.4.0~1061
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5d56061941d2aa444093dd398ebd28847ba0d9d1;p=thirdparty%2Fgcc.git

re PR target/38707 (gcc.c-torture/execute/20050121-1.c ICEs with -march=pentium-m)

	PR target/38707
	* expmed.c (store_bit_field_1): Don't modify op0 if movstrict insn
	can't be used.

From-SVN: r143036
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b2e71d9a7fc0..ce3c62a58921 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-03  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/38707
+	* expmed.c (store_bit_field_1): Don't modify op0 if movstrict insn
+	can't be used.
+
 2009-01-03  Diego Novillo  <dnovillo@google.com>
 
 	* doc/contrib.texi: Update contributions.
diff --git a/gcc/expmed.c b/gcc/expmed.c
index 70a0d18bcb52..50eb45fa6517 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, 2008
+   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -532,6 +532,7 @@ store_bit_field_1 (rtx str_rtx, unsigned HOST_WIDE_INT bitsize,
       int icode = optab_handler (movstrict_optab, fieldmode)->insn_code;
       rtx insn;
       rtx start = get_last_insn ();
+      rtx arg0 = op0;
 
       /* Get appropriate low part of the value being stored.  */
       if (GET_CODE (value) == CONST_INT || REG_P (value))
@@ -552,11 +553,11 @@ store_bit_field_1 (rtx str_rtx, unsigned HOST_WIDE_INT bitsize,
 	  gcc_assert (GET_MODE (SUBREG_REG (op0)) == fieldmode
 		      || GET_MODE_CLASS (fieldmode) == MODE_INT
 		      || GET_MODE_CLASS (fieldmode) == MODE_PARTIAL_INT);
-	  op0 = SUBREG_REG (op0);
+	  arg0 = SUBREG_REG (op0);
 	}
 
       insn = (GEN_FCN (icode)
-		 (gen_rtx_SUBREG (fieldmode, op0,
+		 (gen_rtx_SUBREG (fieldmode, arg0,
 				  (bitnum % BITS_PER_WORD) / BITS_PER_UNIT
 				  + (offset * UNITS_PER_WORD)),
 				  value));