diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2020-02-25 10:21:34 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2020-02-25 10:21:34 +0100 |
| commit | 2473c81cb2d4627f2d72310f4eca951c6084b596 (patch) | |
| tree | 88f88fe214114edb8988d30f61037f3c60c3ffde | |
| parent | fe86f537f010828b7f77ff459cef138e84071660 (diff) | |
| download | gcc-2473c81cb2d4627f2d72310f4eca951c6084b596.zip gcc-2473c81cb2d4627f2d72310f4eca951c6084b596.tar.gz gcc-2473c81cb2d4627f2d72310f4eca951c6084b596.tar.bz2 | |
pass_manager: Fix ICE with -fdump-passes -fdisable-tree-* [PR93874]
dump_passes pushes a dummy function for which it evaluates the gates
and checks whether the pass is enabled or disabled.
Unfortunately, if any -fdisable-*-*/-fenable-*-* options were seen,
we ICE during is_pass_explicitly_enabled_or_disabled because slot
is non-NULL then and the code will do:
cgraph_uid = func ? cgraph_node::get (func)->get_uid () : 0;
but the dummy function doesn't have a cgraph node.
So, either we need to create and then remove a cgraph node for the dummy
function like the following patch, or function.c would need to export the
in_dummy_function flag (or have some way to query that flag from other TUs)
and we'd need to check it in is_pass_explicitly_enabled_or_disabled.
2020-02-25 Jakub Jelinek <jakub@redhat.com>
PR middle-end/93874
* passes.c (pass_manager::dump_passes): Create a cgraph node for the
dummy function and remove it at the end.
* gcc.dg/pr93874.c: New test.
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/passes.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr93874.c | 6 |
4 files changed, 15 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0d6cf71..9d453f1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,9 @@ 2020-02-25 Jakub Jelinek <jakub@redhat.com> + PR middle-end/93874 + * passes.c (pass_manager::dump_passes): Create a cgraph node for the + dummy function and remove it at the end. + PR translation/93864 * config/lm32/lm32.c (lm32_setup_incoming_varargs): Fix comment typo paramter -> parameter. diff --git a/gcc/passes.c b/gcc/passes.c index fd2684f..07b2613 100644 --- a/gcc/passes.c +++ b/gcc/passes.c @@ -950,6 +950,7 @@ void pass_manager::dump_passes () const { push_dummy_function (true); + cgraph_node *node = cgraph_node::get_create (current_function_decl); create_pass_tab (); @@ -959,6 +960,7 @@ pass_manager::dump_passes () const dump_pass_list (all_late_ipa_passes, 1); dump_pass_list (all_passes, 1); + node->remove (); pop_dummy_function (); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 153e4ee..62b000b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2020-02-25 Jakub Jelinek <jakub@redhat.com> + PR middle-end/93874 + * gcc.dg/pr93874.c: New test. + PR ipa/93763 * gcc.dg/ipa/pr93763.c: Adjust the test so that it compiles without warnings and still ICEs before the ipa-cp.c fix. diff --git a/gcc/testsuite/gcc.dg/pr93874.c b/gcc/testsuite/gcc.dg/pr93874.c new file mode 100644 index 0000000..154ef50 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr93874.c @@ -0,0 +1,6 @@ +/* PR middle-end/93874 */ +/* { dg-do compile } */ +/* { dg-options "-fdisable-tree-dse3 -fdump-passes" } */ +/* { dg-prune-output ".*" } */ + +int i; |