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

re PR middle-end/89779 (internal compiler error: tree check: expected class ‘type’, have ‘exceptional’ (error_mark) in tree_nop_conversion_p, at tree.c:12798)

Browse Source 
2019-03-25  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/89779
	* tree-ssa-loop-ivopts.c (remove_unused_ivs): Return
	to remove IV defs, delay actual removal.
	(tree_ssa_iv_optimize_loop): Likewise.  Avoid SCEV reset.
	(tree_ssa_iv_optimize): Remove eliminated IV defs at the
	very end, properly also reset loop control IV information.

From-SVN: r269914
This commit is contained in:
Richard Biener 2019-03-25 12:18:38 +00:00 committed by Richard Biener
parent ecef0d3458
commit c0eb90b5db
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc/ChangeLog
View File

@ -1,3 +1,12 @@
2019-03-25 Richard Biener <rguenther@suse.de>
PR tree-optimization/89779
* tree-ssa-loop-ivopts.c (remove_unused_ivs): Return
to remove IV defs, delay actual removal.
(tree_ssa_iv_optimize_loop): Likewise. Avoid SCEV reset.
(tree_ssa_iv_optimize): Remove eliminated IV defs at the
very end, properly also reset loop control IV information.
2019-03-25 Richard Biener <rguenther@suse.de> 2019-03-25 Richard Biener <rguenther@suse.de>
PR tree-optimization/89802 PR tree-optimization/89802

30
gcc/tree-ssa-loop-ivopts.c
View File

@ -7258,11 +7258,10 @@ rewrite_groups (struct ivopts_data *data)
/* Removes the ivs that are not used after rewriting. */ /* Removes the ivs that are not used after rewriting. */
static void static void
remove_unused_ivs (struct ivopts_data *data) remove_unused_ivs (struct ivopts_data *data, bitmap toremove)
{ {
unsigned j; unsigned j;
bitmap_iterator bi; bitmap_iterator bi;
bitmap toremove = BITMAP_ALLOC (NULL);
/* Figure out an order in which to release SSA DEFs so that we don't /* Figure out an order in which to release SSA DEFs so that we don't
release something that we'd have to propagate into a debug stmt release something that we'd have to propagate into a debug stmt
@ -7384,10 +7383,6 @@ remove_unused_ivs (struct ivopts_data *data)
} }
} }
} }
release_defs_bitset (toremove);
BITMAP_FREE (toremove);
} }
/* Frees memory occupied by struct tree_niter_desc in *VALUE. Callback /* Frees memory occupied by struct tree_niter_desc in *VALUE. Callback
@ -7530,7 +7525,8 @@ loop_body_includes_call (basic_block *body, unsigned num_nodes)
/* Optimizes the LOOP. Returns true if anything changed. */ /* Optimizes the LOOP. Returns true if anything changed. */
static bool static bool
tree_ssa_iv_optimize_loop (struct ivopts_data *data, struct loop *loop) tree_ssa_iv_optimize_loop (struct ivopts_data *data, struct loop *loop,
bitmap toremove)
{ {
bool changed = false; bool changed = false;
struct iv_ca *iv_ca; struct iv_ca *iv_ca;
@ -7600,12 +7596,7 @@ tree_ssa_iv_optimize_loop (struct ivopts_data *data, struct loop *loop)
rewrite_groups (data); rewrite_groups (data);
/* Remove the ivs that are unused after rewriting. */ /* Remove the ivs that are unused after rewriting. */
remove_unused_ivs (data); remove_unused_ivs (data, toremove);
/* We have changed the structure of induction variables; it might happen
that definitions in the scev database refer to some of them that were
eliminated. */
scev_reset ();
finish: finish:
free_loop_data (data); free_loop_data (data);
@ -7620,6 +7611,7 @@ tree_ssa_iv_optimize (void)
{ {
struct loop *loop; struct loop *loop;
struct ivopts_data data; struct ivopts_data data;
auto_bitmap toremove;
tree_ssa_iv_optimize_init (&data); tree_ssa_iv_optimize_init (&data);
@ -7629,9 +7621,19 @@ tree_ssa_iv_optimize (void)
if (dump_file && (dump_flags & TDF_DETAILS)) if (dump_file && (dump_flags & TDF_DETAILS))
flow_loop_dump (loop, dump_file, NULL, 1); flow_loop_dump (loop, dump_file, NULL, 1);
tree_ssa_iv_optimize_loop (&data, loop); tree_ssa_iv_optimize_loop (&data, loop, toremove);
} }
/* Remove eliminated IV defs. */
release_defs_bitset (toremove);
/* We have changed the structure of induction variables; it might happen
that definitions in the scev database refer to some of them that were
eliminated. */
scev_reset_htab ();
/* Likewise niter and control-IV information. */
free_numbers_of_iterations_estimates (cfun);
tree_ssa_iv_optimize_finalize (&data); tree_ssa_iv_optimize_finalize (&data);
} }