MatCat.OpenSource/8sa1-gcc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

if-to-switch: fix memory leak in case merging

Browse Source 
gcc/ChangeLog:

	PR tree-optimization/99002
	PR tree-optimization/99026
	* gimple-if-to-switch.cc (if_chain::is_beneficial): Fix memory
	leak when adjacent cases are merged.
	* tree-switch-conversion.c (switch_decision_tree::analyze_switch_statement): Use
	release_clusters.
	(make_pass_lower_switch): Remove trailing whitespace.
	* tree-switch-conversion.h (release_clusters): New.
This commit is contained in:
Martin Liska 2021-02-10 09:39:54 +01:00
parent 7293251105
commit 57d1b68d65
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gcc/gimple-if-to-switch.cc
View File

@ -227,6 +227,7 @@ if_chain::is_beneficial ()
(left->get_high ()), wi::one (TYPE_PRECISION (type))))
{
left->set_high (right->get_high ());
delete right;
continue;
}
}
@ -241,20 +242,20 @@ if_chain::is_beneficial ()
= jump_table_cluster::find_jump_tables (filtered_clusters);
bool r = output.length () < filtered_clusters.length ();
if (r)
dump_clusters (&output, "JT can be built");
output.release ();
if (r)
return true;
{
dump_clusters (&output, "JT can be built");
release_clusters (output);
return true;
}
else
output.release ();
output = bit_test_cluster::find_bit_tests (filtered_clusters);
r = output.length () < filtered_clusters.length ();
if (r)
dump_clusters (&output, "BT can be built");
for (unsigned i = 0; i < output.length (); i++)
delete output[i];
output.release ();
release_clusters (output);
return r;
}

9
gcc/tree-switch-conversion.c
View File

@ -1824,12 +1824,7 @@ switch_decision_tree::analyze_switch_statement ()
output.release ();
bool expanded = try_switch_expansion (output2);
for (unsigned i = 0; i < output2.length (); i++)
delete output2[i];
output2.release ();
release_clusters (output2);
return expanded;
}
@ -2597,5 +2592,3 @@ make_pass_lower_switch (gcc::context *ctxt)
{
return new pass_lower_switch<false> (ctxt);
}

10
gcc/tree-switch-conversion.h
View File

@ -893,6 +893,16 @@ switch_decision_tree::reset_out_edges_aux (gswitch *swtch)
e->aux = (void *) 0;
}
/* Release CLUSTERS vector and destruct all dynamically allocated items. */
static inline void
release_clusters (vec<cluster *> &clusters)
{
for (unsigned i = 0; i < clusters.length (); i++)
delete clusters[i];
clusters.release ();
}
} // tree_switch_conversion namespace
#endif // TREE_SWITCH_CONVERSION_H