From: Daniel Jacobowitz <dan@codesourcery.com>
Date: Thu, 6 Mar 2008 20:26:48 +0000 (+0000)
Subject: expmed.c (extract_bit_field): Always use adjust_address for MEM.
X-Git-Tag: prereleases/gcc-4.2.4-rc1~94
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7d093b8783c506c49376040d533cfe99a844cfd;p=thirdparty%2Fgcc.git

expmed.c (extract_bit_field): Always use adjust_address for MEM.

	* expmed.c (extract_bit_field): Always use adjust_address for MEM.

	* gcc.c-torture/execute/20080222-1.c: New test.

From-SVN: r132990
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0c3c1a94ba61..07c0564b046f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-06  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* expmed.c (extract_bit_field): Always use adjust_address for MEM.
+
 2008-03-05  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	Backport:
diff --git a/gcc/expmed.c b/gcc/expmed.c
index 26e4cd48338b..d392197d8e94 100644
--- a/gcc/expmed.c
+++ b/gcc/expmed.c
@@ -1260,18 +1260,15 @@ extract_bit_field (rtx str_rtx, unsigned HOST_WIDE_INT bitsize,
 		  || (offset * BITS_PER_UNIT % bitsize == 0
 		      && MEM_ALIGN (op0) % bitsize == 0)))))
     {
-      if (mode1 != GET_MODE (op0))
+      if (MEM_P (op0))
+	op0 = adjust_address (op0, mode1, offset);
+      else if (mode1 != GET_MODE (op0))
 	{
-	  if (MEM_P (op0))
-	    op0 = adjust_address (op0, mode1, offset);
-	  else
-	    {
-	      rtx sub = simplify_gen_subreg (mode1, op0, GET_MODE (op0),
-					     byte_offset);
-	      if (sub == NULL)
-		goto no_subreg_mode_swap;
-	      op0 = sub;
-	    }
+	  rtx sub = simplify_gen_subreg (mode1, op0, GET_MODE (op0),
+					 byte_offset);
+	  if (sub == NULL)
+	    goto no_subreg_mode_swap;
+	  op0 = sub;
 	}
       if (mode1 != mode)
 	return convert_to_mode (tmode, op0, unsignedp);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 63e8ec67140d..10b5a150d4c2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-06  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* gcc.c-torture/execute/20080222-1.c: New test.
+
 2008-03-03  Uros Bizjak  <ubizjak@gmail.com>
 
 	* gcc.dg/vect/vect-99.c: Include stdlib.h and tree-vect.h.
diff --git a/gcc/testsuite/gcc.c-torture/execute/20080222-1.c b/gcc/testsuite/gcc.c-torture/execute/20080222-1.c
new file mode 100644
index 000000000000..6db83ccdf902
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/20080222-1.c
@@ -0,0 +1,22 @@
+extern void abort (void);
+
+struct container
+{
+  unsigned char data[1];
+};
+
+unsigned char space[6] = {1, 2, 3, 4, 5, 6};
+
+int
+foo (struct container *p)
+{
+  return p->data[4];
+}
+
+int
+main ()
+{
+  if (foo ((struct container *) space) != 5)
+    abort ();
+  return 0;
+}