From: Mikhail Maltsev <maltsevm@gmail.com>
To: gcc-patches <gcc-patches@gnu.org>
Subject: [PATCH][RFA] PR rtl-optimization/66237
Date: Fri, 22 May 2015 08:33:00 -0000 [thread overview]
Message-ID: <555EE873.9010202@gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 422 bytes --]
This patch fixes a bug introduced by refactoring. A cast from rtx_insn
to rtx_jump_insn in fix_crossing_conditional_branches was placed before
the check, and that caused ICE if the instruction is actually a call,
rather than a jump.
Bootstrapped/regtested on x86_64 linux and tested the regressed case
(PR34999) on aarch64 crosscompiler using the provided profiling data.
OK for trunk?
--
Regards,
Mikhail Maltsev
[-- Attachment #2: pr66237.clog --]
[-- Type: text/plain, Size: 187 bytes --]
gcc/ChangeLog:
2015-05-22 Mikhail Maltsev <maltsevm@gmail.com>
PR rtl-optimization/66237
* bb-reorder.c (fix_crossing_conditional_branches): Fix wrong
location of an "as_a" cast.
[-- Attachment #3: pr66237.patch --]
[-- Type: text/plain, Size: 1434 bytes --]
diff --git a/gcc/bb-reorder.c b/gcc/bb-reorder.c
index 20e15fc..cbf6343 100644
--- a/gcc/bb-reorder.c
+++ b/gcc/bb-reorder.c
@@ -2044,7 +2044,7 @@ fix_crossing_conditional_branches (void)
if (crossing_edge)
{
- rtx_jump_insn *old_jump = as_a <rtx_jump_insn *> (BB_END (cur_bb));
+ rtx_insn *old_jump = BB_END (cur_bb);
/* Check to make sure the jump instruction is a
conditional jump. */
@@ -2067,6 +2067,9 @@ fix_crossing_conditional_branches (void)
if (set_src && (GET_CODE (set_src) == IF_THEN_ELSE))
{
+ rtx_jump_insn *old_jump_insn =
+ as_a <rtx_jump_insn *> (old_jump);
+
if (GET_CODE (XEXP (set_src, 1)) == PC)
old_label = XEXP (set_src, 2);
else if (GET_CODE (XEXP (set_src, 2)) == PC)
@@ -2095,7 +2098,7 @@ fix_crossing_conditional_branches (void)
emit_label (new_label);
gcc_assert (GET_CODE (old_label) == LABEL_REF);
- old_jump_target = old_jump->jump_target ();
+ old_jump_target = old_jump_insn->jump_target ();
new_jump = as_a <rtx_jump_insn *>
(emit_jump_insn (gen_jump (old_jump_target)));
new_jump->set_jump_target (old_jump_target);
@@ -2114,7 +2117,7 @@ fix_crossing_conditional_branches (void)
/* Make old jump branch to new bb. */
- redirect_jump (old_jump, new_label, 0);
+ redirect_jump (old_jump_insn, new_label, 0);
/* Remove crossing_edge as predecessor of 'dest'. */
next reply other threads:[~2015-05-22 8:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-22 8:33 Mikhail Maltsev [this message]
2015-05-22 20:38 ` Jeff Law
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=555EE873.9010202@gmail.com \
--to=maltsevm@gmail.com \
--cc=gcc-patches@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).