> From: Hans-Peter Nilsson <h...@axis.com> > Date: Mon, 23 Dec 2013 23:34:02 +0100
Just as previously done on trunk, I'm going to cover up PR59584 (which was fixed and then exposed on the 4.8 branch) by applying commit r206187 from trunk below. Again, the PR bug is an ICE caused by the combination of expr.c:find_args_size_adjust and expr.c:fixup_args_size_notes not able to handle a define_split matching for the stack-adjustment assignment instruction emitted by __builtin_stack_restore (the insn that gets the REG_ARGS_SIZE note). *This* bug is slightly different but the fix happens to cover up that bug by not matching the splitter for the stack-pointer; the destination is used as a temporary, so sp is set to something unusable as a stack-pointer, ungood. Tested cris-elf, makes gcc.dg/pr50251.c pass again, will commit to the 4.8 branch. > PR middle-end/59584 > * config/cris/predicates.md (cris_nonsp_register_operand): > New define_predicate. > * config/cris/cris.md: Replace register_operand with > cris_nonsp_register_operand for destinations in all > define_splits where a register is set more than once. > > Index: gcc/config/cris/cris.md > =================================================================== > --- gcc/config/cris/cris.md (revision 206176) > +++ gcc/config/cris/cris.md (working copy) > @@ -758,7 +758,7 @@ (define_split > (match_operand:SI 1 "const_int_operand" "")) > (match_operand:SI 2 "register_operand" ""))]) > (match_operand 3 "register_operand" "")) > - (set (match_operand:SI 4 "register_operand" "") > + (set (match_operand:SI 4 "cris_nonsp_register_operand" "") > (plus:SI (mult:SI (match_dup 0) > (match_dup 1)) > (match_dup 2)))])] > @@ -859,7 +859,7 @@ (define_split > (match_operand:SI 0 "cris_bdap_operand" "") > (match_operand:SI 1 "cris_bdap_operand" ""))]) > (match_operand 2 "register_operand" "")) > - (set (match_operand:SI 3 "register_operand" "") > + (set (match_operand:SI 3 "cris_nonsp_register_operand" "") > (plus:SI (match_dup 0) (match_dup 1)))])] > "reload_completed && reg_overlap_mentioned_p (operands[3], operands[2])" > [(set (match_dup 4) (match_dup 2)) > @@ -3960,7 +3960,7 @@ (define_expand "casesi" > ;; up. > > (define_split > - [(set (match_operand 0 "register_operand" "") > + [(set (match_operand 0 "cris_nonsp_register_operand" "") > (match_operator > 4 "cris_operand_extend_operator" > [(match_operand 1 "register_operand" "") > @@ -3990,7 +3990,7 @@ (define_split > ;; Call this op-extend-split-rx=rz > > (define_split > - [(set (match_operand 0 "register_operand" "") > + [(set (match_operand 0 "cris_nonsp_register_operand" "") > (match_operator > 4 "cris_plus_or_bound_operator" > [(match_operand 1 "register_operand" "") > @@ -4018,7 +4018,7 @@ (define_split > ;; Call this op-extend-split-swapped > > (define_split > - [(set (match_operand 0 "register_operand" "") > + [(set (match_operand 0 "cris_nonsp_register_operand" "") > (match_operator > 4 "cris_plus_or_bound_operator" > [(match_operator > @@ -4044,7 +4044,7 @@ (define_split > ;; bound. Call this op-extend-split-swapped-rx=rz. > > (define_split > - [(set (match_operand 0 "register_operand" "") > + [(set (match_operand 0 "cris_nonsp_register_operand" "") > (match_operator > 4 "cris_plus_or_bound_operator" > [(match_operator > @@ -4075,7 +4075,7 @@ (define_split > ;; Call this op-extend. > > (define_split > - [(set (match_operand 0 "register_operand" "") > + [(set (match_operand 0 "cris_nonsp_register_operand" "") > (match_operator > 3 "cris_orthogonal_operator" > [(match_operand 1 "register_operand" "") > @@ -4099,7 +4099,7 @@ (define_split > ;; Call this op-split-rx=rz > > (define_split > - [(set (match_operand 0 "register_operand" "") > + [(set (match_operand 0 "cris_nonsp_register_operand" "") > (match_operator > 3 "cris_commutative_orth_op" > [(match_operand 2 "memory_operand" "") > @@ -4123,7 +4123,7 @@ (define_split > ;; Call this op-split-swapped. > > (define_split > - [(set (match_operand 0 "register_operand" "") > + [(set (match_operand 0 "cris_nonsp_register_operand" "") > (match_operator > 3 "cris_commutative_orth_op" > [(match_operand 1 "register_operand" "") > @@ -4146,7 +4146,7 @@ (define_split > ;; Call this op-split-swapped-rx=rz. > > (define_split > - [(set (match_operand 0 "register_operand" "") > + [(set (match_operand 0 "cris_nonsp_register_operand" "") > (match_operator > 3 "cris_orthogonal_operator" > [(match_operand 2 "memory_operand" "") > @@ -4555,10 +4555,11 @@ (define_split > ;; We're not allowed to generate copies of registers with different mode > ;; until after reload; copying pseudos upsets reload. CVS as of > ;; 2001-08-24, unwind-dw2-fde.c, _Unwind_Find_FDE ICE in > -;; cselib_invalidate_regno. > +;; cselib_invalidate_regno. Also, don't do this for the stack-pointer, > +;; as we don't want it set temporarily to an invalid value. > > (define_split ; indir_to_reg_split > - [(set (match_operand 0 "register_operand" "") > + [(set (match_operand 0 "cris_nonsp_register_operand" "") > (match_operand 1 "indirect_operand" ""))] > "reload_completed > && REG_P (operands[0]) > @@ -4574,7 +4575,7 @@ (define_split ; indir_to_reg_split > ;; As the above, but MOVS and MOVU. > > (define_split > - [(set (match_operand 0 "register_operand" "") > + [(set (match_operand 0 "cris_nonsp_register_operand" "") > (match_operator > 4 "cris_extend_operator" > [(match_operand 1 "indirect_operand" "")]))] > Index: gcc/config/cris/predicates.md > =================================================================== > --- gcc/config/cris/predicates.md (revision 206176) > +++ gcc/config/cris/predicates.md (working copy) > @@ -76,6 +76,10 @@ (define_predicate "cris_simple_operand" > (match_test "cris_simple_address_operand (XEXP (op, 0), > Pmode)")))) > > +(define_predicate "cris_nonsp_register_operand" > + (and (match_operand 0 "register_operand") > + (match_test "op != stack_pointer_rtx"))) > + > ;; The caller needs to use :SI. > (define_predicate "cris_bdap_sign_extend_operand" > ; Disabled until > <URL:http://gcc.gnu.org/ml/gcc-patches/2005-10/msg01376.html> brgds, H-P
