aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/function.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4b81033..c96e021 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-10 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
+
+ * function.c (stack_protect_epilogue): Remove as_a<rtx_insn *> ()
+ call that isn't needed.
+
2015-10-09 Jeff Law <law@redhat.com>
* tree-ssanames.c (flush_ssaname_freelist): Use splice and truncate
diff --git a/gcc/function.c b/gcc/function.c
index d16d6d8..db5bc1c 100644
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -4986,7 +4986,7 @@ stack_protect_epilogue (void)
{
tree guard_decl = targetm.stack_protect_guard ();
rtx_code_label *label = gen_label_rtx ();
- rtx x, y, tmp;
+ rtx x, y;
rtx_insn *seq;
x = expand_normal (crtl->stack_protect_guard);
@@ -5005,9 +5005,9 @@ stack_protect_epilogue (void)
things moved out of line. Since this is the only extant case of adding
a noreturn function at the rtl level, it doesn't seem worth doing ought
except adding the prediction by hand. */
- tmp = get_last_insn ();
+ rtx_insn *tmp = get_last_insn ();
if (JUMP_P (tmp))
- predict_insn_def (as_a <rtx_insn *> (tmp), PRED_NORETURN, TAKEN);
+ predict_insn_def (tmp, PRED_NORETURN, TAKEN);
expand_call (targetm.stack_protect_fail (), NULL_RTX, /*ignore=*/true);
free_temp_slots ();