diff mbox series

[COMMITTED] Make dump_ranger routines externally visible.

Message ID 20210919153954.178251-1-aldyh@redhat.com
State New
Headers show
Series [COMMITTED] Make dump_ranger routines externally visible. | expand

Commit Message

Aldy Hernandez Sept. 19, 2021, 3:39 p.m. UTC 
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.
---
 gcc/gimple-range-path.cc  | 8 ++++++--
 gcc/gimple-range-trace.cc | 4 ++--
 gcc/gimple-range-trace.h  | 3 +++
 3 files changed, 11 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/gcc/gimple-range-path.cc b/gcc/gimple-range-path.cc
index c616b65756f..10b018b5211 100644
--- 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 5175d1400c4..2417c21f1f2 100644
--- 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 b9546a245d1..d3e69e03543 100644
--- 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