diff options
| author | Thomas Preud'homme <thomas.preudhomme@arm.com> | 2015-04-21 10:23:25 +0000 |
|---|---|---|
| committer | Thomas Preud'homme <thopre01@gcc.gnu.org> | 2015-04-21 10:23:25 +0000 |
| commit | 8f252203d8d1bd6d5db396b42deb22b855809dfb (patch) | |
| tree | 23c00ac29013ba4d54735d4c4b008b9b25c425b2 /gcc | |
| parent | 22fe969f2c42d8ac8e978e8454625f176b8fba76 (diff) | |
| download | gcc-8f252203d8d1bd6d5db396b42deb22b855809dfb.zip gcc-8f252203d8d1bd6d5db396b42deb22b855809dfb.tar.gz gcc-8f252203d8d1bd6d5db396b42deb22b855809dfb.tar.bz2 | |
df-core.c (df_finish_pass): Iterate over df->problems_by_index[] and use df_remove_problem rather than...
2015-04-21 Thomas Preud'homme <thomas.preudhomme@arm.com>
* df-core.c (df_finish_pass): Iterate over df->problems_by_index[] and
use df_remove_problem rather than manually removing problems, leaving
holes in df->problems_in_order[].
From-SVN: r222260
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/df-core.c | 19 |
2 files changed, 12 insertions, 13 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 64e9aae..73ede9e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2015-04-21 Thomas Preud'homme <thomas.preudhomme@arm.com> + + * df-core.c (df_finish_pass): Iterate over df->problems_by_index[] and + use df_remove_problem rather than manually removing problems, leaving + holes in df->problems_in_order[]. + 2015-04-21 Tom de Vries <tom@codesourcery.com> PR tree-optimization/65802 diff --git a/gcc/df-core.c b/gcc/df-core.c index 82f1364..67040a1 100644 --- a/gcc/df-core.c +++ b/gcc/df-core.c @@ -642,7 +642,6 @@ void df_finish_pass (bool verify ATTRIBUTE_UNUSED) { int i; - int removed = 0; #ifdef ENABLE_DF_CHECKING int saved_flags; @@ -658,21 +657,15 @@ df_finish_pass (bool verify ATTRIBUTE_UNUSED) saved_flags = df->changeable_flags; #endif - for (i = 0; i < df->num_problems_defined; i++) + /* We iterate over problems by index as each problem removed will + lead to problems_in_order to be reordered. */ + for (i = 0; i < DF_LAST_PROBLEM_PLUS1; i++) { - struct dataflow *dflow = df->problems_in_order[i]; - struct df_problem *problem = dflow->problem; + struct dataflow *dflow = df->problems_by_index[i]; - if (dflow->optional_p) - { - gcc_assert (problem->remove_problem_fun); - (problem->remove_problem_fun) (); - df->problems_in_order[i] = NULL; - df->problems_by_index[problem->id] = NULL; - removed++; - } + if (dflow && dflow->optional_p) + df_remove_problem (dflow); } - df->num_problems_defined -= removed; /* Clear all of the flags. */ df->changeable_flags = 0; |