print-rtl: Change return type of two print functions from int to void

Also change one internal variable to bool.

gcc/ChangeLog:

	* rtl.h (print_rtl_single): Change return type from int to void.
	(print_rtl_single_with_indent): Ditto.
	* print-rtl.h (class rtx_writer): Ditto.  Change m_sawclose to bool.
	* print-rtl.cc (rtx_writer::rtx_writer): Update for m_sawclose change.
	(rtx_writer::print_rtx_operand_code_0): Ditto.
	(rtx_writer::print_rtx_operand_codes_E_and_V): Ditto.
	(rtx_writer::print_rtx_operand_code_i): Ditto.
	(rtx_writer::print_rtx_operand_code_u): Ditto.
	(rtx_writer::print_rtx_operand): Ditto.
	(rtx_writer::print_rtx): Ditto.
	(rtx_writer::finish_directive): Ditto.
	(print_rtl_single): Change return type from int to void
	and adjust function body accordingly.
	(rtx_writer::print_rtl_single_with_indent): Ditto.

diff --git a/gcc/print-rtl.cc b/gcc/print-rtl.cc
index f67bf8687787403cf2a260b8da42de95afa359ec..c59d9896edb57200fb253b0c94b3f9d7510640b2 100644 (file)
--- a/gcc/print-rtl.cc
+++ b/gcc/print-rtl.cc
@@ -85,7 +85,7 @@ int flag_dump_unnumbered_links = 0;
 
 rtx_writer::rtx_writer (FILE *outf, int ind, bool simple, bool compact,
                        rtx_reuse_manager *reuse_manager ATTRIBUTE_UNUSED)
-: m_outfile (outf), m_sawclose (0), m_indent (ind),
+: m_outfile (outf), m_indent (ind), m_sawclose (false),
   m_in_call_function_usage (false), m_simple (simple), m_compact (compact)
 #ifndef GENERATOR_FILE
   , m_rtx_reuse_manager (reuse_manager)
@@ -237,13 +237,13 @@ rtx_writer::print_rtx_operand_code_0 (const_rtx in_rtx ATTRIBUTE_UNUSED,
            fprintf (m_outfile, " #");
          else
            fprintf (m_outfile, " %d", NOTE_EH_HANDLER (in_rtx));
-         m_sawclose = 1;
+         m_sawclose = true;
          break;
 
        case NOTE_INSN_BLOCK_BEG:
        case NOTE_INSN_BLOCK_END:
          dump_addr (m_outfile, " ", NOTE_BLOCK (in_rtx));
-         m_sawclose = 1;
+         m_sawclose = true;
          break;
 
        case NOTE_INSN_BASIC_BLOCK:
@@ -370,7 +370,7 @@ rtx_writer::print_rtx_operand_codes_E_and_V (const_rtx in_rtx, int idx)
     {
       fprintf (m_outfile, "\n%s%*s",
       print_rtx_head, m_indent * 2, "");
-      m_sawclose = 0;
+      m_sawclose = false;
     }
   if (GET_CODE (in_rtx) == CONST_VECTOR
       && !GET_MODE_NUNITS (GET_MODE (in_rtx)).is_constant ()
@@ -381,7 +381,7 @@ rtx_writer::print_rtx_operand_codes_E_and_V (const_rtx in_rtx, int idx)
     {
       m_indent += 2;
       if (XVECLEN (in_rtx, idx))
-       m_sawclose = 1;
+       m_sawclose = true;
 
       int barrier = XVECLEN (in_rtx, idx);
       if (GET_CODE (in_rtx) == CONST_VECTOR
@@ -431,7 +431,7 @@ rtx_writer::print_rtx_operand_codes_E_and_V (const_rtx in_rtx, int idx)
     fprintf (m_outfile, "\n%s%*s", print_rtx_head, m_indent * 2, "");
 
   fputs ("]", m_outfile);
-  m_sawclose = 1;
+  m_sawclose = true;
   m_indent -= 2;
 }
 
@@ -510,7 +510,7 @@ rtx_writer::print_rtx_operand_code_i (const_rtx in_rtx, int idx)
       /* Don't print INSN_CODEs in compact mode.  */
       if (m_compact && is_insn && &INSN_CODE (in_rtx) == &XINT (in_rtx, idx))
        {
-         m_sawclose = 0;
+         m_sawclose = false;
          return;
        }
 
@@ -524,7 +524,7 @@ rtx_writer::print_rtx_operand_code_i (const_rtx in_rtx, int idx)
          && XINT (in_rtx, idx) >= 0
          && (name = get_insn_name (XINT (in_rtx, idx))) != NULL)
        fprintf (m_outfile, " {%s}", name);
-      m_sawclose = 0;
+      m_sawclose = false;
     }
 }
 
@@ -619,7 +619,7 @@ rtx_writer::print_rtx_operand_code_u (const_rtx in_rtx, int idx)
                fprintf (m_outfile, " [# deleted]");
              else
                fprintf (m_outfile, " [%d deleted]", INSN_UID (sub));
-             m_sawclose = 0;
+             m_sawclose = false;
              return;
            }
 
@@ -640,7 +640,7 @@ rtx_writer::print_rtx_operand_code_u (const_rtx in_rtx, int idx)
     }
   else
     fputs (" 0", m_outfile);
-  m_sawclose = 0;
+  m_sawclose = false;
 }
 
 /* Subroutine of print_rtx.   Print operand IDX of IN_RTX.  */
@@ -667,7 +667,7 @@ rtx_writer::print_rtx_operand (const_rtx in_rtx, int idx)
        fputs (" (nil)", m_outfile);
       else
        fprintf (m_outfile, " (\"%s\")", str);
-      m_sawclose = 1;
+      m_sawclose = true;
       break;
 
     case '0':
@@ -709,7 +709,7 @@ rtx_writer::print_rtx_operand (const_rtx in_rtx, int idx)
 
     case 'n':
       fprintf (m_outfile, " %s", GET_NOTE_INSN_NAME (XINT (in_rtx, idx)));
-      m_sawclose = 0;
+      m_sawclose = false;
       break;
 
     case 'u':
@@ -729,7 +729,7 @@ rtx_writer::print_rtx_operand (const_rtx in_rtx, int idx)
 
     case '*':
       fputs (" Unknown", m_outfile);
-      m_sawclose = 0;
+      m_sawclose = false;
       break;
 
     case 'B':
@@ -797,20 +797,20 @@ rtx_writer::print_rtx (const_rtx in_rtx)
        fputc (' ', m_outfile);
       else
        fprintf (m_outfile, "\n%s%*s", print_rtx_head, m_indent * 2, "");
-      m_sawclose = 0;
+      m_sawclose = false;
     }
 
   if (in_rtx == 0)
     {
       fputs ("(nil)", m_outfile);
-      m_sawclose = 1;
+      m_sawclose = true;
       return;
     }
   else if (GET_CODE (in_rtx) > NUM_RTX_CODE)
     {
        fprintf (m_outfile, "(??? bad code %d\n%s%*s)", GET_CODE (in_rtx),
                print_rtx_head, m_indent * 2, "");
-       m_sawclose = 1;
+       m_sawclose = true;
        return;
     }
 
@@ -829,7 +829,7 @@ rtx_writer::print_rtx (const_rtx in_rtx)
          if (m_rtx_reuse_manager->seen_def_p (reuse_id))
            {
              fprintf (m_outfile, "reuse_rtx %i)", reuse_id);
-             m_sawclose = 1;
+             m_sawclose = true;
              return;
            }
          else
@@ -907,7 +907,7 @@ rtx_writer::print_rtx (const_rtx in_rtx)
          if (PAT_VAR_LOCATION_STATUS (in_rtx)
              == VAR_INIT_STATUS_UNINITIALIZED)
            fprintf (m_outfile, " [uninit]");
-         m_sawclose = 1;
+         m_sawclose = true;
          idx = GET_RTX_LENGTH (VAR_LOCATION);
        }
 #endif
@@ -1027,7 +1027,7 @@ rtx_writer::print_rtx (const_rtx in_rtx)
     }
 
   fputc (')', m_outfile);
-  m_sawclose = 1;
+  m_sawclose = true;
 }
 
 /* Emit a closing parenthesis and newline.  */
@@ -1036,7 +1036,7 @@ void
 rtx_writer::finish_directive ()
 {
   fprintf (m_outfile, ")\n");
-  m_sawclose = 0;
+  m_sawclose = false;
 }
 
 /* Print an rtx on the current line of FILE.  Initially indent IND
@@ -1223,18 +1223,17 @@ print_rtl (FILE *outf, const_rtx rtx_first)
 }
 
 /* Like print_rtx, except specify a file.  */
-/* Return nonzero if we actually printed anything.  */
 
-int
+void
 print_rtl_single (FILE *outf, const_rtx x)
 {
   rtx_writer w (outf, 0, false, false, NULL);
-  return w.print_rtl_single_with_indent (x, 0);
+  w.print_rtl_single_with_indent (x, 0);
 }
 
 /* Like print_rtl_single, except specify an indentation.  */
 
-int
+void
 rtx_writer::print_rtl_single_with_indent (const_rtx x, int ind)
 {
   char *s_indent = (char *) alloca ((size_t) ind + 1);
@@ -1245,11 +1244,10 @@ rtx_writer::print_rtl_single_with_indent (const_rtx x, int ind)
 
   int old_indent = m_indent;
   m_indent = ind;
-  m_sawclose = 0;
+  m_sawclose = false;
   print_rtx (x);
   putc ('\n', m_outfile);
   m_indent = old_indent;
-  return 1;
 }
 
 

diff --git a/gcc/print-rtl.h b/gcc/print-rtl.h
index ddaec107710081f1258f3e54352b2175258f1100..d4c7dda94821f4877fcfbe4bd72a79893f57a90d 100644 (file)
--- a/gcc/print-rtl.h
+++ b/gcc/print-rtl.h
@@ -36,7 +36,7 @@ class rtx_writer
 
   void print_rtx (const_rtx in_rtx);
   void print_rtl (const_rtx rtx_first);
-  int print_rtl_single_with_indent (const_rtx x, int ind);
+  void print_rtl_single_with_indent (const_rtx x, int ind);
 
   void finish_directive ();
 
@@ -52,8 +52,8 @@ class rtx_writer
 
  private:
   FILE *m_outfile;
-  int m_sawclose;
   int m_indent;
+  bool m_sawclose;
   bool m_in_call_function_usage;
 
   /* True means use simplified format without flags, modes, etc.  */

diff --git a/gcc/rtl.h b/gcc/rtl.h
index 3f0af780634a0b330ca06a7a623cbf81277976cc..4c993e8270839ef2778c292c053b80b77ea71a43 100644 (file)
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -4241,8 +4241,8 @@ extern const rtx_insn *debug_rtx_find (const rtx_insn *, int);
 extern void print_mem_expr (FILE *, const_tree);
 extern void print_rtl (FILE *, const_rtx);
 extern void print_simple_rtl (FILE *, const_rtx);
-extern int print_rtl_single (FILE *, const_rtx);
-extern int print_rtl_single_with_indent (FILE *, const_rtx, int);
+extern void print_rtl_single (FILE *, const_rtx);
+extern void print_rtl_single_with_indent (FILE *, const_rtx, int);
 extern void print_inline_rtx (FILE *, const_rtx, int);
 
 /* In stmt.cc */