diff options
| author | David Malcolm <dmalcolm@redhat.com> | 2014-08-21 08:53:25 +0000 |
|---|---|---|
| committer | David Malcolm <dmalcolm@gcc.gnu.org> | 2014-08-21 08:53:25 +0000 |
| commit | 53f04688052e6367be2d4294f792c1d35917746f (patch) | |
| tree | 0b6d1e063ada11b8ec1e68c6ab780ad80727d3a1 | |
| parent | f630fc6ab056ba999b808a0784107320bbebb445 (diff) | |
| download | gcc-53f04688052e6367be2d4294f792c1d35917746f.zip gcc-53f04688052e6367be2d4294f792c1d35917746f.tar.gz gcc-53f04688052e6367be2d4294f792c1d35917746f.tar.bz2 | |
try_split returns an rtx_insn
2014-08-21 David Malcolm <dmalcolm@redhat.com>
* rtl.h (try_split): Strengthen return type from rtx to rtx_insn *.
* emit-rtl.c (try_split): Likewise, also for locals "before" and
"after". For now, don't strengthen param "trial", which requires
adding checked casts when returning it.
From-SVN: r214260
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/emit-rtl.c | 12 | ||||
| -rw-r--r-- | gcc/rtl.h | 2 |
3 files changed, 15 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d7b5b184..518d86f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,13 @@ 2014-08-21 David Malcolm <dmalcolm@redhat.com> + * rtl.h (try_split): Strengthen return type from rtx to rtx_insn *. + + * emit-rtl.c (try_split): Likewise, also for locals "before" and + "after". For now, don't strengthen param "trial", which requires + adding checked casts when returning it. + +2014-08-21 David Malcolm <dmalcolm@redhat.com> + * debug.h (struct gcc_debug_hooks): Strengthen param 1 of hook "label" from rtx to rtx_code_label *. Strengthen param 1 of "var_location" hook from rtx to rtx_insn *. diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c index 0ca59ad..2d7d854 100644 --- a/gcc/emit-rtl.c +++ b/gcc/emit-rtl.c @@ -3551,11 +3551,11 @@ mark_label_nuses (rtx x) replacement insn depending on the value of LAST. Otherwise, it returns TRIAL. If the insn to be returned can be split, it will be. */ -rtx +rtx_insn * try_split (rtx pat, rtx trial, int last) { - rtx before = PREV_INSN (trial); - rtx after = NEXT_INSN (trial); + rtx_insn *before = PREV_INSN (trial); + rtx_insn *after = NEXT_INSN (trial); int has_barrier = 0; rtx note, seq, tem; int probability; @@ -3565,7 +3565,7 @@ try_split (rtx pat, rtx trial, int last) /* We're not good at redistributing frame information. */ if (RTX_FRAME_RELATED_P (trial)) - return trial; + return as_a <rtx_insn *> (trial); if (any_condjump_p (trial) && (note = find_reg_note (trial, REG_BR_PROB, 0))) @@ -3585,7 +3585,7 @@ try_split (rtx pat, rtx trial, int last) } if (!seq) - return trial; + return as_a <rtx_insn *> (trial); /* Avoid infinite loop if any insn of the result matches the original pattern. */ @@ -3594,7 +3594,7 @@ try_split (rtx pat, rtx trial, int last) { if (INSN_P (insn_last) && rtx_equal_p (PATTERN (insn_last), pat)) - return trial; + return as_a <rtx_insn *> (trial); if (!NEXT_INSN (insn_last)) break; insn_last = NEXT_INSN (insn_last); @@ -2465,7 +2465,7 @@ extern rtx delete_related_insns (rtx); extern rtx *find_constant_term_loc (rtx *); /* In emit-rtl.c */ -extern rtx try_split (rtx, rtx, int); +extern rtx_insn *try_split (rtx, rtx, int); extern int split_branch_probability; /* In unknown file */ |