From: Tom de Vries <tom@codesourcery.com>
Date: Fri, 30 Oct 2015 08:38:24 +0000 (+0000)
Subject: Cleanup fipa-pta constraint dumping
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bf74904272f65550e2741344ab6d94854af2fc6e;p=gcc.git

Cleanup fipa-pta constraint dumping

2015-10-30  Tom de Vries  <tom@codesourcery.com>

	* tree-ssa-structalias.c (ipa_pta_execute): Declare variable from as
	unsigned, and initialize, and use initial value instead of hardcoded
	constant.  Add generic constraints dumping section.  Don't dump global
	initializers constraints dumping section if empty.  Don't update
	variable from if unused.

From-SVN: r229569
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 934711b183b..e9379ddc490 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2015-10-30  Tom de Vries  <tom@codesourcery.com>
+
+	* tree-ssa-structalias.c (ipa_pta_execute): Declare variable from as
+	unsigned, and initialize, and use initial value instead of hardcoded
+	constant.  Add generic constraints dumping section.  Don't dump global
+	initializers constraints dumping section if empty.  Don't update
+	variable from if unused.
+
 2015-10-29  Mikhail Maltsev  <maltsevm@gmail.com>
 
 	* config/alpha/alpha.c (alpha_function_arg): Use gcc_checking_assert,
diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c
index 97987139e5f..55608ef143a 100644
--- a/gcc/tree-ssa-structalias.c
+++ b/gcc/tree-ssa-structalias.c
@@ -7284,7 +7284,7 @@ ipa_pta_execute (void)
 {
   struct cgraph_node *node;
   varpool_node *var;
-  int from;
+  unsigned int from = 0;
 
   in_ipa_mode = 1;
 
@@ -7296,6 +7296,14 @@ ipa_pta_execute (void)
       fprintf (dump_file, "\n");
     }
 
+  if (dump_file)
+    {
+      fprintf (dump_file, "Generating generic constraints\n\n");
+      dump_constraints (dump_file, from);
+      fprintf (dump_file, "\n");
+      from = constraints.length ();
+    }
+
   /* Build the constraints.  */
   FOR_EACH_DEFINED_FUNCTION (node)
     {
@@ -7324,14 +7332,15 @@ ipa_pta_execute (void)
       get_vi_for_tree (var->decl);
     }
 
-  if (dump_file)
+  if (dump_file
+      && from != constraints.length ())
     {
       fprintf (dump_file,
 	       "Generating constraints for global initializers\n\n");
-      dump_constraints (dump_file, 0);
+      dump_constraints (dump_file, from);
       fprintf (dump_file, "\n");
+      from = constraints.length ();
     }
-  from = constraints.length ();
 
   FOR_EACH_DEFINED_FUNCTION (node)
     {
@@ -7416,8 +7425,8 @@ ipa_pta_execute (void)
 	  fprintf (dump_file, "\n");
 	  dump_constraints (dump_file, from);
 	  fprintf (dump_file, "\n");
+	  from = constraints.length ();
 	}
-      from = constraints.length ();
     }
 
   /* From the constraints compute the points-to sets.  */