Add comment saying file is deprecated

[pf3gnuchains/gcc-fork.git] / gcc / gimple-pretty-print.c

diff --git a/gcc/gimple-pretty-print.c b/gcc/gimple-pretty-print.c
index ec366f8..70ab4e1 100644 (file)
--- a/gcc/gimple-pretty-print.c
+++ b/gcc/gimple-pretty-print.c
@@ -508,7 +508,7 @@ dump_gimple_call (pretty_printer *buffer, gimple gs, int spc, int flags)
 
          pp_space (buffer);
         }
-      dump_generic_node (buffer, gimple_call_fn (gs), spc, flags, false);
+      print_call_name (buffer, gimple_call_fn (gs), flags);
       pp_string (buffer, " (");
       dump_gimple_call_args (buffer, gs, flags);
       pp_character (buffer, ')');
@@ -1150,6 +1150,22 @@ dump_gimple_phi (pretty_printer *buffer, gimple phi, int spc, int flags)
     }
   for (i = 0; i < gimple_phi_num_args (phi); i++)
     {
+      if ((flags & TDF_LINENO) && gimple_phi_arg_has_location (phi, i))
+        {
+         expanded_location xloc;
+
+         xloc = expand_location (gimple_phi_arg_location (phi, i));
+         pp_character (buffer, '[');
+         if (xloc.file)
+           {
+             pp_string (buffer, xloc.file);
+             pp_string (buffer, " : ");
+           }
+         pp_decimal_int (buffer, xloc.line);
+         pp_string (buffer, ":");
+         pp_decimal_int (buffer, xloc.column);
+         pp_string (buffer, "] ");
+       }
       dump_generic_node (buffer, gimple_phi_arg_def (phi, i), spc, flags,
                         false);
       pp_character (buffer, '(');
@@ -1379,9 +1395,18 @@ dump_gimple_stmt (pretty_printer *buffer, gimple gs, int spc, int flags)
          pp_string (buffer, " : ");
        }
       pp_decimal_int (buffer, xloc.line);
+      pp_string (buffer, ":");
+      pp_decimal_int (buffer, xloc.column);
       pp_string (buffer, "] ");
     }
 
+  if (flags & TDF_EH)
+    {
+      int eh_region = lookup_stmt_eh_region_fn (cfun, gs);
+      if (eh_region >= 0)
+       pp_printf (buffer, "[EH #%d] ", eh_region);
+    }
+
   if ((flags & (TDF_VOPS|TDF_MEMSYMS))
       && gimple_has_mem_ops (gs))
     dump_gimple_mem_ops (buffer, gs, spc, flags);
@@ -1558,6 +1583,12 @@ dump_bb_header (pretty_printer *buffer, basic_block bb, int indent, int flags)
                pp_decimal_int (buffer, get_lineno (gsi_stmt (gsi)));
                break;
              }
+
+          if (bb->discriminator)
+            {
+              pp_string (buffer, ", discriminator ");
+             pp_decimal_int (buffer, bb->discriminator);
+            }
        }
       newline_and_indent (buffer, indent);
 
@@ -1724,6 +1755,8 @@ dump_implicit_edges (pretty_printer *buffer, basic_block bb, int indent,
              pp_string (buffer, " : ");
            }
          pp_decimal_int (buffer, goto_xloc.line);
+         pp_string (buffer, " : ");
+         pp_decimal_int (buffer, goto_xloc.column);
          pp_string (buffer, "] ");
        }