procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR target/69461 (ICE in lra_set_insn_recog_data, at lra.c:964)

Browse source 
2016-02-03  Vladimir Makarov  <vmakarov@redhat.com>
	    Alexandre Oliva  <aoliva@redhat.com>

	PR target/69461
	* lra-constraints.c (simplify_operand_subreg): Check additionally
	address validity after potential reloading.
	(process_address_1): Check insns validity.  In case of failure do
	nothing.

2016-02-03  Vladimir Makarov  <vmakarov@redhat.com>
	    Alexandre Oliva  <aoliva@redhat.com>

	PR target/69461
	* gcc.target/powerpc/pr69461.c: New.


Co-Authored-By: Alexandre Oliva <aoliva@redhat.com>

From-SVN: r233107
This commit is contained in:
Vladimir Makarov 2016-02-03 17:58:34 +00:00 • committed by Vladimir Makarov
parent ccc71ab85a
commit 95831c01a2
4 changed files with 61 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gcc/ChangeLog
View file

@ -1,3 +1,12 @@
2016-02-03 Vladimir Makarov <vmakarov@redhat.com>
Alexandre Oliva <aoliva@redhat.com>
PR target/69461
* lra-constraints.c (simplify_operand_subreg): Check additionally
address validity after potential reloading.
(process_address_1): Check insns validity. In case of failure do
nothing.
2016-02-03 Kirill Yukhin <kirill.yukhin@intel.com>
PR target/69118

34
gcc/lra-constraints.c
View file

@ -1411,6 +1411,21 @@ simplify_operand_subreg (int nop, machine_mode reg_mode)
|| valid_address_p (GET_MODE (subst), XEXP (subst, 0),
MEM_ADDR_SPACE (subst)))
return true;
else if ((get_constraint_type (lookup_constraint
(curr_static_id->operand[nop].constraint))
!= CT_SPECIAL_MEMORY)
/* We still can reload address and if the address is
valid, we can remove subreg without reloading its
inner memory. */
&& valid_address_p (GET_MODE (subst),
regno_reg_rtx
[ira_class_hard_regs
[base_reg_class (GET_MODE (subst),
MEM_ADDR_SPACE (subst),
ADDRESS, SCRATCH)][0]],
MEM_ADDR_SPACE (subst)))
return true;
/* If the address was valid and became invalid, prefer to reload
the memory. Typical case is when the index scale should
correspond the memory. */
@ -2958,6 +2973,8 @@ process_address_1 (int nop, bool check_only_p,
{
if (ad.index == NULL)
{
rtx_insn *insn;
rtx_insn *last = get_last_insn ();
int code = -1;
enum reg_class cl = base_reg_class (ad.mode, ad.as,
SCRATCH, SCRATCH);
@ -2966,9 +2983,6 @@ process_address_1 (int nop, bool check_only_p,
new_reg = lra_create_new_reg (Pmode, NULL_RTX, cl, "addr");
if (HAVE_lo_sum)
{
rtx_insn *insn;
rtx_insn *last = get_last_insn ();
/* addr => lo_sum (new_base, addr), case (2) above. */
insn = emit_insn (gen_rtx_SET
(new_reg,
@ -3004,6 +3018,20 @@ process_address_1 (int nop, bool check_only_p,
{
/* addr => new_base, case (2) above. */
lra_emit_move (new_reg, addr);
for (insn = last == NULL_RTX ? get_insns () : NEXT_INSN (last);
insn != NULL_RTX;
insn = NEXT_INSN (insn))
if (recog_memoized (insn) < 0)
break;
if (insn != NULL_RTX)
{
/* Do nothing if we cannot generate right insns.
This is analogous to reload pass behaviour. */
delete_insns_since (last);
end_sequence ();
return false;
}
*ad.inner = new_reg;
}
}

6
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,9 @@
2016-02-03 Vladimir Makarov <vmakarov@redhat.com>
Alexandre Oliva <aoliva@redhat.com>
PR target/69461
* gcc.target/powerpc/pr69461.c: New.
2016-02-03 Uros Bizjak <ubizjak@gmail.com>
* lib/tsan-dg.exp (tsan_init): Move check if tsan executable

15
gcc/testsuite/gcc.target/powerpc/pr69461.c Normal file
View file

@ -0,0 +1,15 @@
/* { dg-do compile } */
/* { dg-options "-O3 -mlra" } */
extern void _setjmp (void);
typedef struct {
double real;
double imag;
} Py_complex;
Py_complex a;
Py_complex fn1();
Py_complex fn2() { return fn1(); }
void fn3() {
_setjmp();
a = fn2();
}