OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

combine: Fix PR80233 

If combine has added an unconditional trap there will be a new basic
block as well.  It will then end up considering the NOTE_INSN_BASIC_BLOCK
as the last_combined_insn, but then it tries to take the DF_INSN_LUID
of that and that dereferences a NULL pointer (since such a note is not
an INSN_P).

This fixes it by not taking non-insns as last_combined_insn.


	PR rtl-optimization/80233
	* combine.c (combine_instructions): Only take NONDEBUG_INSN_P insns
	as last_combined_insn.  Do not test for BARRIER_P separately.

gcc/testsuite/
	PR rtl-optimization/80233
	* gcc.c-torture/compile/pr80233.c: New testcase.

From-SVN: r246575
This commit is contained in:
Segher Boessenkool 2017-03-29 22:53:59 +02:00 committed by Segher Boessenkool
parent 6f8de3dd3c
commit 533c0b6943
4 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2017-03-29 Segher Boessenkool <segher@kernel.crashing.org>
PR rtl-optimization/80233
* combine.c (combine_instructions): Only take NONDEBUG_INSN_P insns
as last_combined_insn. Do not test for BARRIER_P separately.
2017-03-29 Andreas Schwab <schwab@suse.de>
PR ada/80146

4
gcc/combine.c
View File

@ -1250,10 +1250,10 @@ combine_instructions (rtx_insn *f, unsigned int nregs)
continue;
while (last_combined_insn
&& last_combined_insn->deleted ())
&& (!NONDEBUG_INSN_P (last_combined_insn)
|| last_combined_insn->deleted ()))
last_combined_insn = PREV_INSN (last_combined_insn);
if (last_combined_insn == NULL_RTX
|| BARRIER_P (last_combined_insn)
|| BLOCK_FOR_INSN (last_combined_insn) != this_basic_block
|| DF_INSN_LUID (last_combined_insn) <= DF_INSN_LUID (insn))
last_combined_insn = insn;

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2017-03-29 Segher Boessenkool <segher@kernel.crashing.org>
PR rtl-optimization/80233
* gcc.c-torture/compile/pr80233.c: New testcase.
2017-03-28 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/80254

22
gcc/testsuite/gcc.c-torture/compile/pr80233.c Normal file
View File

@ -0,0 +1,22 @@
/* PR rtl-optimization/80233 */
int xg;
void
t4 (int o9)
{
int it;
if (o9 == 0)
{
int fx;
xg *= it;
if (xg == 0)
it /= 0;
fx = (it != 0) ? (xg < 0) : (xg / o9);
if (fx != 0)
xg = 0;
}
}