|
 |
72e591 |
2005-11-28 Jakub Jelinek <jakub@redhat.com>
|
|
|
72e591 |
|
|
|
72e591 |
* config/rs6000/rs6000.c (rs6000_return_addr): If COUNT == 0,
|
|
|
72e591 |
read word RETURN_ADDRESS_OFFSET bytes above arg_pointer_rtx
|
|
|
72e591 |
instead of doing an extran indirection from frame_pointer_rtx.
|
|
|
72e591 |
|
|
|
72e591 |
* gcc.dg/20051128-1.c: New test.
|
|
|
72e591 |
|
|
|
72e591 |
--- gcc/config/rs6000/rs6000.c.jj 2005-11-26 14:38:01.000000000 +0100
|
|
|
72e591 |
+++ gcc/config/rs6000/rs6000.c 2005-11-28 20:32:18.000000000 +0100
|
|
|
72e591 |
@@ -20970,18 +20970,22 @@ rs6000_return_addr (int count, rtx frame
|
|
|
72e591 |
if (count != 0
|
|
|
72e591 |
|| ((DEFAULT_ABI == ABI_V4 || DEFAULT_ABI == ABI_DARWIN) && flag_pic))
|
|
|
72e591 |
{
|
|
|
72e591 |
+ rtx x;
|
|
|
72e591 |
cfun->machine->ra_needs_full_frame = 1;
|
|
|
72e591 |
|
|
|
72e591 |
- return
|
|
|
72e591 |
- gen_rtx_MEM
|
|
|
72e591 |
- (Pmode,
|
|
|
72e591 |
- memory_address
|
|
|
72e591 |
- (Pmode,
|
|
|
72e591 |
- plus_constant (Pmode,
|
|
|
72e591 |
- copy_to_reg
|
|
|
72e591 |
- (gen_rtx_MEM (Pmode,
|
|
|
72e591 |
- memory_address (Pmode, frame))),
|
|
|
72e591 |
- RETURN_ADDRESS_OFFSET)));
|
|
|
72e591 |
+ if (count == 0)
|
|
|
72e591 |
+ {
|
|
|
72e591 |
+ gcc_assert (frame == frame_pointer_rtx);
|
|
|
72e591 |
+ x = arg_pointer_rtx;
|
|
|
72e591 |
+ }
|
|
|
72e591 |
+ else
|
|
|
72e591 |
+ {
|
|
|
72e591 |
+ x = memory_address (Pmode, frame);
|
|
|
72e591 |
+ x = copy_to_reg (gen_rtx_MEM (Pmode, x));
|
|
|
72e591 |
+ }
|
|
|
72e591 |
+
|
|
|
72e591 |
+ x = plus_constant (Pmode, x, RETURN_ADDRESS_OFFSET);
|
|
|
72e591 |
+ return gen_rtx_MEM (Pmode, memory_address (Pmode, x));
|
|
|
72e591 |
}
|
|
|
72e591 |
|
|
|
72e591 |
cfun->machine->ra_need_lr = 1;
|
|
|
72e591 |
--- gcc/testsuite/gcc.dg/20051128-1.c.jj 2005-10-10 11:21:41.096999000 +0200
|
|
|
72e591 |
+++ gcc/testsuite/gcc.dg/20051128-1.c 2005-11-28 12:30:57.000000000 +0100
|
|
|
72e591 |
@@ -0,0 +1,41 @@
|
|
|
72e591 |
+/* { dg-do run } */
|
|
|
72e591 |
+/* { dg-options "-O2 -fpic" } */
|
|
|
72e591 |
+
|
|
|
72e591 |
+extern void exit (int);
|
|
|
72e591 |
+extern void abort (void);
|
|
|
72e591 |
+
|
|
|
72e591 |
+int b;
|
|
|
72e591 |
+
|
|
|
72e591 |
+struct A
|
|
|
72e591 |
+{
|
|
|
72e591 |
+ void *pad[147];
|
|
|
72e591 |
+ void *ra, *h;
|
|
|
72e591 |
+ long o;
|
|
|
72e591 |
+};
|
|
|
72e591 |
+
|
|
|
72e591 |
+void
|
|
|
72e591 |
+__attribute__((noinline))
|
|
|
72e591 |
+foo (struct A *a, void *x)
|
|
|
72e591 |
+{
|
|
|
72e591 |
+ __builtin_memset (a, 0, sizeof (a));
|
|
|
72e591 |
+ if (!b)
|
|
|
72e591 |
+ exit (0);
|
|
|
72e591 |
+}
|
|
|
72e591 |
+
|
|
|
72e591 |
+void
|
|
|
72e591 |
+__attribute__((noinline))
|
|
|
72e591 |
+bar (void)
|
|
|
72e591 |
+{
|
|
|
72e591 |
+ struct A a;
|
|
|
72e591 |
+
|
|
|
72e591 |
+ __builtin_unwind_init ();
|
|
|
72e591 |
+ foo (&a, __builtin_return_address (0));
|
|
|
72e591 |
+}
|
|
|
72e591 |
+
|
|
|
72e591 |
+int
|
|
|
72e591 |
+main (void)
|
|
|
72e591 |
+{
|
|
|
72e591 |
+ bar ();
|
|
|
72e591 |
+ abort ();
|
|
|
72e591 |
+ return 0;
|
|
|
72e591 |
+}
|