re PR ipa/91062 (gcc.dg/ipa/ipa-pta-1.c dump contains garbage when gcc was configured...

2019-07-04  Richard Biener  <rguenther@suse.de>

	PR ipa/91062
	* tree-pass.h (execute_all_ipa_transforms): Add a flag
	parameter whether to disable GC collection.
	* passes.c (execute_one_ipa_transform_pass): Likewise, and
	honor it.
	(execute_all_ipa_transforms): Likewise and pass it down.
	* cgraph.c (cgraph_node::get_body): Do not invoke garbage
	collection from applying IPA transforms.
	* cgraphunit.c (cgraph_node::expand): Allow garbage collection
	from applying IPA transforms.

From-SVN: r273083

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 591e2972a16984a8e49b2fbe8ed089fda8a2cb3c..19ab956a98cf0a659a5e9c311b97ef5928b8f792 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,16 @@
+2019-07-04  Richard Biener  <rguenther@suse.de>
+
+       PR ipa/91062
+       * tree-pass.h (execute_all_ipa_transforms): Add a flag
+       parameter whether to disable GC collection.
+       * passes.c (execute_one_ipa_transform_pass): Likewise, and
+       honor it.
+       (execute_all_ipa_transforms): Likewise and pass it down.
+       * cgraph.c (cgraph_node::get_body): Do not invoke garbage
+       collection from applying IPA transforms.
+       * cgraphunit.c (cgraph_node::expand): Allow garbage collection
+       from applying IPA transforms.
+
 2019-07-04  Richard Biener  <rguenther@suse.de>
 
        PR tree-optimization/90911

diff --git a/gcc/cgraph.c b/gcc/cgraph.c
index d161db96f14de9c9b64598c711cef4e9aaad60c1..a7e3bcf2132629e32a10c3d62b20e1bca602d3c5 100644 (file)
--- a/gcc/cgraph.c
+++ b/gcc/cgraph.c
@@ -3618,7 +3618,7 @@ cgraph_node::get_body (void)
       set_dump_file (NULL);
 
       push_cfun (DECL_STRUCT_FUNCTION (decl));
-      execute_all_ipa_transforms ();
+      execute_all_ipa_transforms (true);
       cgraph_edge::rebuild_edges ();
       free_dominance_info (CDI_DOMINATORS);
       free_dominance_info (CDI_POST_DOMINATORS);

diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index f4d668819c622c1a1d705978e377297e0d459dd2..5999b9e0de8df22b71d6d36363bcf588e90c5b83 100644 (file)
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -2184,7 +2184,7 @@ cgraph_node::expand (void)
 
   bitmap_obstack_initialize (&reg_obstack); /* FIXME, only at RTL generation*/
 
-  execute_all_ipa_transforms ();
+  execute_all_ipa_transforms (false);
 
   /* Perform all tree transforms and optimizations.  */
 

diff --git a/gcc/passes.c b/gcc/passes.c
index c6331cbc49db0e2fc5fd1c7d0ac7240d3a44c237..bd56004d909be5c872ac414900c9fe1451dbeb6c 100644 (file)
--- a/gcc/passes.c
+++ b/gcc/passes.c
@@ -2182,7 +2182,7 @@ execute_ipa_summary_passes (ipa_opt_pass_d *ipa_pass)
 
 static void
 execute_one_ipa_transform_pass (struct cgraph_node *node,
-                               ipa_opt_pass_d *ipa_pass)
+                               ipa_opt_pass_d *ipa_pass, bool do_not_collect)
 {
   opt_pass *pass = ipa_pass;
   unsigned int todo_after = 0;
@@ -2228,14 +2228,14 @@ execute_one_ipa_transform_pass (struct cgraph_node *node,
   redirect_edge_var_map_empty ();
 
   /* Signal this is a suitable GC collection point.  */
-  if (!(todo_after & TODO_do_not_ggc_collect))
+  if (!do_not_collect && !(todo_after & TODO_do_not_ggc_collect))
     ggc_collect ();
 }
 
 /* For the current function, execute all ipa transforms. */
 
 void
-execute_all_ipa_transforms (void)
+execute_all_ipa_transforms (bool do_not_collect)
 {
   struct cgraph_node *node;
   if (!cfun)
@@ -2247,7 +2247,8 @@ execute_all_ipa_transforms (void)
       unsigned int i;
 
       for (i = 0; i < node->ipa_transforms_to_apply.length (); i++)
-       execute_one_ipa_transform_pass (node, node->ipa_transforms_to_apply[i]);
+       execute_one_ipa_transform_pass (node, node->ipa_transforms_to_apply[i],
+                                       do_not_collect);
       node->ipa_transforms_to_apply.release ();
     }
 }

diff --git a/gcc/tree-pass.h b/gcc/tree-pass.h
index 3a0b3805d24dbd50141d4145563861e4ae3768f3..b27dbdd0cb7d0e9033f52a9df103354364dfc5e1 100644 (file)
--- a/gcc/tree-pass.h
+++ b/gcc/tree-pass.h
@@ -632,7 +632,7 @@ extern bool execute_one_pass (opt_pass *);
 extern void execute_pass_list (function *, opt_pass *);
 extern void execute_ipa_pass_list (opt_pass *);
 extern void execute_ipa_summary_passes (ipa_opt_pass_d *);
-extern void execute_all_ipa_transforms (void);
+extern void execute_all_ipa_transforms (bool);
 extern void execute_all_ipa_stmt_fixups (struct cgraph_node *, gimple **);
 extern bool pass_init_dump_file (opt_pass *);
 extern void pass_fini_dump_file (opt_pass *);