Make dump_ranger routines externally visible.

There was an inline extern declaration for dump_ranger that was a bit of
a hack.  I've removed it in favor of an actual prototype.  There are
also some trivial changes to the dumping code in the path solver.

gcc/ChangeLog:

	* gimple-range-path.cc (path_range_query::path_range_query): Add
	header.
	(path_range_query::dump): Remove extern declaration of dump_ranger.
	* gimple-range-trace.cc (dump_ranger): Add DEBUG_FUNCTION marker.
	* gimple-range-trace.h (dump_ranger): Add prototype.

diff --git a/gcc/gimple-range-path.cc b/gcc/gimple-range-path.cc
index c616b65756fcc82ad5a111b0300d6f481478f0de..10b018b5211a3c061a496aacb02dd3a3c4120f39 100644 (file)
--- a/gcc/gimple-range-path.cc
+++ b/gcc/gimple-range-path.cc
@@ -37,6 +37,9 @@ along with GCC; see the file COPYING3.  If not see
 path_range_query::path_range_query (gimple_ranger &ranger)
   : m_ranger (ranger)
 {
+  if (DEBUG_SOLVER)
+    fprintf (dump_file, "\n*********** path_range_query ******************\n");
+
   m_cache = new ssa_global_cache;
   m_has_cache_entry = BITMAP_ALLOC (NULL);
   m_path = NULL;
@@ -85,14 +88,15 @@ path_range_query::set_cache (const irange &r, tree name)
 void
 path_range_query::dump (FILE *dump_file)
 {
+  push_dump_file save (dump_file, dump_flags & ~TDF_DETAILS);
+
   if (m_path->is_empty ())
     return;
 
   unsigned i;
   bitmap_iterator bi;
-  extern void dump_ranger (FILE *, const vec<basic_block> &);
 
-  fprintf (dump_file, "Path is (length=%d):\n", m_path->length ());
+  fprintf (dump_file, "\nPath is (length=%d):\n", m_path->length ());
   dump_ranger (dump_file, *m_path);
 
   fprintf (dump_file, "Imports:\n");

diff --git a/gcc/gimple-range-trace.cc b/gcc/gimple-range-trace.cc
index 5175d1400c44df0f380bf946de813b79424eb00b..2417c21f1f269175e0743d5fa7be6a2a4a4d9fa7 100644 (file)
--- a/gcc/gimple-range-trace.cc
+++ b/gcc/gimple-range-trace.cc
@@ -176,7 +176,7 @@ push_dump_file::~push_dump_file ()
 
 // Dump all that ranger knows for the current function.
 
-DEBUG_FUNCTION void
+void
 dump_ranger (FILE *out)
 {
   push_dump_file save (out, dump_flags);
@@ -201,7 +201,7 @@ debug_ranger ()
 // Note that the blocks are in reverse order, thus the exit block is
 // path[0].
 
-DEBUG_FUNCTION void
+void
 dump_ranger (FILE *dump_file, const vec<basic_block> &path)
 {
   if (path.length () == 0)

diff --git a/gcc/gimple-range-trace.h b/gcc/gimple-range-trace.h
index b9546a245d139be49d57bdacf654d43b57d16d2a..d3e69e03543b963987180a81829db349b6ca7d76 100644 (file)
--- a/gcc/gimple-range-trace.h
+++ b/gcc/gimple-range-trace.h
@@ -72,4 +72,7 @@ private:
   dump_flags_t old_dump_flags;
 };
 
+void dump_ranger (FILE *);
+void dump_ranger (FILE *, const vec<basic_block> &path);
+
 #endif // GCC_GIMPLE_RANGE_TRACE_H