From ed4439b12944ccd426f51eb63f9fc234a7517e2a Mon Sep 17 00:00:00 2001
From: rsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 17 Jul 2006 15:31:12 +0000
Subject: [PATCH] gcc/ 	PR middle-end/28403 	* optabs.c
 (expand_doubleword_shift): Wrap the call to 	do_compare_rtx_and_jump with
 NO_DEFER_POP and OK_DEFER_POP.

gcc/testsuite/
	PR middle-end/28403
	* gcc.c-torture/execute/pr28403.c: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@115525 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog                                 |  6 +++++
 gcc/optabs.c                                  |  2 ++
 gcc/testsuite/ChangeLog                       |  5 ++++
 gcc/testsuite/gcc.c-torture/execute/pr28403.c | 23 +++++++++++++++++++
 4 files changed, 36 insertions(+)
 create mode 100644 gcc/testsuite/gcc.c-torture/execute/pr28403.c

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e9dba8e49952..7a7b79f159b6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-17  Richard Sandiford  <richard@codesourcery.com>
+
+	PR middle-end/28403
+	* optabs.c (expand_doubleword_shift): Wrap the call to
+	do_compare_rtx_and_jump with NO_DEFER_POP and OK_DEFER_POP.
+
 2006-07-17  Richard Sandiford  <richard@codesourcery.com>
 
 	PR middle-end/28402
diff --git a/gcc/optabs.c b/gcc/optabs.c
index a8be6f98ce32..fe7ae0659628 100644
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -959,8 +959,10 @@ expand_doubleword_shift (enum machine_mode op1_mode, optab binoptab,
   subword_label = gen_label_rtx ();
   done_label = gen_label_rtx ();
 
+  NO_DEFER_POP;
   do_compare_rtx_and_jump (cmp1, cmp2, cmp_code, false, op1_mode,
 			   0, 0, subword_label);
+  OK_DEFER_POP;
 
   if (!expand_superword_shift (binoptab, outof_input, superword_op1,
 			       outof_target, into_target,
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e79fd296a7e9..a9398a3f4678 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-17  Richard Sandiford  <richard@codesourcery.com>
+
+	PR middle-end/28403
+	* gcc.c-torture/execute/pr28403.c: New test.
+
 2006-07-17  Richard Sandiford  <richard@codesourcery.com>
 
 	PR middle-end/28402
diff --git a/gcc/testsuite/gcc.c-torture/execute/pr28403.c b/gcc/testsuite/gcc.c-torture/execute/pr28403.c
new file mode 100644
index 000000000000..8f85ea08505c
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/pr28403.c
@@ -0,0 +1,23 @@
+typedef unsigned long long ull;
+int global;
+
+int __attribute__((noinline))
+foo (int x1, int x2, int x3, int x4, int x5, int x6, int x7, int x8)
+{
+  global = x1 + x2 + x3 + x4 + x5 + x6 + x7 + x8;
+}
+
+ull __attribute__((noinline))
+bar (ull x)
+{
+  foo (1, 2, 1, 3, 1, 4, 1, 5);
+  return x >> global;
+}
+
+int
+main (void)
+{
+  if (bar (0x123456789abcdefULL) != (0x123456789abcdefULL >> 18))
+    abort ();
+  exit (0);
+}
-- 
GitLab