From 4e07d762e9719ec962aca7e2c56f15cfdc76a529 Mon Sep 17 00:00:00 2001
From: Geoffrey Keating <geoffk@redhat.com>
Date: Wed, 27 Feb 2002 20:27:38 +0000
Subject: [PATCH] Index: ChangeLog

	* expmed.c (expand_shift): Correctly test for low part of a
	subreg.

Index: testsuite/ChangeLog

	* gcc.c-torture/execute/20020225-2.c: New test.

From-SVN: r50114
---
 gcc/ChangeLog                                 |  5 +++++
 gcc/expmed.c                                  |  2 +-
 gcc/testsuite/ChangeLog                       |  4 ++++
 .../gcc.c-torture/execute/20020225-2.c        | 19 +++++++++++++++++++
 4 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/gcc.c-torture/execute/20020225-2.c

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7722a6d3332..42fd508ba72 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-27  Geoffrey Keating  <geoffk@redhat.com>
+
+	* expmed.c (expand_shift): Correctly test for low part of a
+	subreg.
+
 2002-02-27  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	* config/s390/s390.c (s390_chunkify_pool): Do not confuse
diff --git a/gcc/expmed.c b/gcc/expmed.c
index b3d94c2376f..46007a30330 100644
--- a/gcc/expmed.c
+++ b/gcc/expmed.c
@@ -1913,7 +1913,7 @@ expand_shift (code, mode, shifted, amount, target, unsignedp)
         op1 = GEN_INT ((unsigned HOST_WIDE_INT) INTVAL (op1)
 		       % GET_MODE_BITSIZE (mode));
       else if (GET_CODE (op1) == SUBREG
-	       && SUBREG_BYTE (op1) == 0)
+	       && subreg_lowpart_p (op1))
 	op1 = SUBREG_REG (op1);
     }
 #endif
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b2820d62bab..d6b70d39409 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-27  Geoffrey Keating  <geoffk@redhat.com>
+
+	* gcc.c-torture/execute/20020225-2.c: New test.
+
 2002-02-27  Zack Weinberg  <zack@codesourcery.com>
 
 	* gcc.c-torture/execute/920730-1t.c,
diff --git a/gcc/testsuite/gcc.c-torture/execute/20020225-2.c b/gcc/testsuite/gcc.c-torture/execute/20020225-2.c
new file mode 100644
index 00000000000..5c91596096b
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/20020225-2.c
@@ -0,0 +1,19 @@
+static int 
+test(int x)
+{
+  union 
+    {
+      int i;
+      double d;
+  } a;
+  a.d = 0;
+  a.i = 1;
+  return x >> a.i;
+}
+
+int main(void)
+{
+  if (test (5) != 2)
+    abort ();
+  exit (0);
+}