diff options
| author | Segher Boessenkool <segher@kernel.crashing.org> | 2015-04-09 00:52:24 +0200 |
|---|---|---|
| committer | Segher Boessenkool <segher@gcc.gnu.org> | 2015-04-09 00:52:24 +0200 |
| commit | 4673a218dfe642879060bde3f7880b1a8fb02007 (patch) | |
| tree | df44cad531a1ebe974d2645445b6b0ef26dcfd8d /gcc/combine.c | |
| parent | 466df27b94978d9323033d4d1e6a90708c493640 (diff) | |
| download | gcc-4673a218dfe642879060bde3f7880b1a8fb02007.zip gcc-4673a218dfe642879060bde3f7880b1a8fb02007.tar.gz gcc-4673a218dfe642879060bde3f7880b1a8fb02007.tar.bz2 | |
re PR rtl-optimization/65693 (ICE in assign_by_spills, at lra-assigns.c:1419)
PR rtl-optimization/65693
* combine.c (is_parallel_of_n_reg_sets): Change first argument
from an rtx_insn * to an rtx.
(try_combine): Adjust both callers. Use it once more.
From-SVN: r221937
Diffstat (limited to 'gcc/combine.c')
| -rw-r--r-- | gcc/combine.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/gcc/combine.c b/gcc/combine.c index 71e5690..6f4a8da 100644 --- a/gcc/combine.c +++ b/gcc/combine.c @@ -2493,13 +2493,11 @@ update_cfg_for_uncondjump (rtx_insn *insn) } #ifndef HAVE_cc0 -/* Return whether INSN is a PARALLEL of exactly N register SETs followed +/* Return whether PAT is a PARALLEL of exactly N register SETs followed by an arbitrary number of CLOBBERs. */ static bool -is_parallel_of_n_reg_sets (rtx_insn *insn, int n) +is_parallel_of_n_reg_sets (rtx pat, int n) { - rtx pat = PATTERN (insn); - if (GET_CODE (pat) != PARALLEL) return false; @@ -2907,7 +2905,7 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, decrement insn. */ if (i1 == 0 - && is_parallel_of_n_reg_sets (i2, 2) + && is_parallel_of_n_reg_sets (PATTERN (i2), 2) && (GET_MODE_CLASS (GET_MODE (SET_DEST (XVECEXP (PATTERN (i2), 0, 0)))) == MODE_CC) && GET_CODE (SET_SRC (XVECEXP (PATTERN (i2), 0, 0))) == COMPARE @@ -2939,7 +2937,7 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, make those two SETs separate I1 and I2 insns, and make an I0 that is the original I1. */ if (i0 == 0 - && is_parallel_of_n_reg_sets (i2, 2) + && is_parallel_of_n_reg_sets (PATTERN (i2), 2) && can_split_parallel_of_n_reg_sets (i2, 2) && !reg_used_between_p (SET_DEST (XVECEXP (PATTERN (i2), 0, 0)), i2, i3) && !reg_used_between_p (SET_DEST (XVECEXP (PATTERN (i2), 0, 1)), i2, i3)) @@ -3460,10 +3458,7 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, debug info less accurate. */ if (!(added_sets_2 && i1 == 0) - && GET_CODE (newpat) == PARALLEL - && XVECLEN (newpat, 0) == 2 - && GET_CODE (XVECEXP (newpat, 0, 0)) == SET - && GET_CODE (XVECEXP (newpat, 0, 1)) == SET + && is_parallel_of_n_reg_sets (newpat, 2) && asm_noperands (newpat) < 0) { rtx set0 = XVECEXP (newpat, 0, 0); |