diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/builtins.c | 18 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.c-torture/execute/pr64242.c | 33 |
4 files changed, 35 insertions, 28 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5833d7f..d6dd1bd 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2019-06-03 Wilco Dijkstra <wdijkstr@arm.com> + + PR middle-end/64242 + * builtins.c (expand_builtin_longjmp): Add frame clobbers and schedule + block. + (expand_builtin_nonlocal_goto): Likewise. + 2019-06-03 Szabolcs Nagy <szabolcs.nagy@arm.com> * config/aarch64/aarch64-protos.h (aarch64_asm_output_alias): Declare. diff --git a/gcc/builtins.c b/gcc/builtins.c index 3f32754..3463ffb 100644 --- a/gcc/builtins.c +++ b/gcc/builtins.c @@ -1137,15 +1137,20 @@ expand_builtin_longjmp (rtx buf_addr, rtx value) emit_insn (targetm.gen_nonlocal_goto (value, lab, stack, fp)); else { - lab = copy_to_reg (lab); - emit_clobber (gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (VOIDmode))); emit_clobber (gen_rtx_MEM (BLKmode, hard_frame_pointer_rtx)); + lab = copy_to_reg (lab); + /* Restore the frame pointer and stack pointer. We must use a temporary since the setjmp buffer may be a local. */ fp = copy_to_reg (fp); emit_stack_restore (SAVE_NONLOCAL, stack); + + /* Ensure the frame pointer move is not optimized. */ + emit_insn (gen_blockage ()); + emit_clobber (hard_frame_pointer_rtx); + emit_clobber (frame_pointer_rtx); emit_move_insn (hard_frame_pointer_rtx, fp); emit_use (hard_frame_pointer_rtx); @@ -1284,15 +1289,20 @@ expand_builtin_nonlocal_goto (tree exp) emit_insn (targetm.gen_nonlocal_goto (const0_rtx, r_label, r_sp, r_fp)); else { - r_label = copy_to_reg (r_label); - emit_clobber (gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (VOIDmode))); emit_clobber (gen_rtx_MEM (BLKmode, hard_frame_pointer_rtx)); + r_label = copy_to_reg (r_label); + /* Restore the frame pointer and stack pointer. We must use a temporary since the setjmp buffer may be a local. */ r_fp = copy_to_reg (r_fp); emit_stack_restore (SAVE_NONLOCAL, r_sp); + + /* Ensure the frame pointer move is not optimized. */ + emit_insn (gen_blockage ()); + emit_clobber (hard_frame_pointer_rtx); + emit_clobber (frame_pointer_rtx); emit_move_insn (hard_frame_pointer_rtx, r_fp); /* USE of hard_frame_pointer_rtx added for consistency; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6ed70b4..f0faea0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-06-03 Wilco Dijkstra <wdijkstr@arm.com> + + PR middle-end/64242 + * gcc.c-torture/execute/pr64242.c: Update test. + 2019-06-03 Szabolcs Nagy <szabolcs.nagy@arm.com> * gcc.target/aarch64/pcs_attribute-2.c: New test. diff --git a/gcc/testsuite/gcc.c-torture/execute/pr64242.c b/gcc/testsuite/gcc.c-torture/execute/pr64242.c index 46a7b23..e6139ed 100644 --- a/gcc/testsuite/gcc.c-torture/execute/pr64242.c +++ b/gcc/testsuite/gcc.c-torture/execute/pr64242.c @@ -5,46 +5,31 @@ extern void abort (void); __attribute ((noinline)) void broken_longjmp (void *p) { - void *buf[5]; + void *buf[32]; __builtin_memcpy (buf, p, 5 * sizeof (void*)); /* Corrupts stack pointer... */ __builtin_longjmp (buf, 1); } -__attribute ((noipa)) __UINTPTR_TYPE__ -foo (void *p) -{ - return (__UINTPTR_TYPE__) p; -} - -__attribute ((noipa)) void -bar (void *p) -{ - asm volatile ("" : : "r" (p)); -} - volatile int x = 0; -void *volatile p; -void *volatile q; +char *volatile p; +char *volatile q; int main () { void *buf[5]; - struct __attribute__((aligned (32))) S { int a[4]; } s; - bar (&s); p = __builtin_alloca (x); + q = __builtin_alloca (x); if (!__builtin_setjmp (buf)) broken_longjmp (buf); + /* Compute expected next alloca offset - some targets don't align properly + and allocate too much. */ + p = q + (q - p); + /* Fails if stack pointer corrupted. */ - q = __builtin_alloca (x); - if (foo (p) < foo (q)) - { - if (foo (q) - foo (p) >= 1024) - abort (); - } - else if (foo (p) - foo (q) >= 1024) + if (p != __builtin_alloca (x)) abort (); return 0; |