From 286e8fc16fb582ee1cb3869aafb87309542a55ec Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Sat, 13 Jul 2013 19:10:29 -0400
Subject: [PATCH] print-tree.c (debug_vec_tree): Use debug_raw.

	* print-tree.c (debug_vec_tree): Use debug_raw.
	(debug_raw (vec<tree, va_gc> &)): New.
	(debug_raw (vec<tree, va_gc> *)): New.
	* tree.h: Declare them.

From-SVN: r200940
---
 gcc/ChangeLog    |  7 +++++++
 gcc/print-tree.c | 36 +++++++++++++++++++++++++++++++-----
 gcc/tree.h       |  2 ++
 3 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 61082beb3ee..1bcd9942189 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2013-07-13  Jason Merrill  <jason@redhat.com>
+
+	* print-tree.c (debug_vec_tree): Use debug_raw.
+	(debug_raw (vec<tree, va_gc> &)): New.
+	(debug_raw (vec<tree, va_gc> *)): New.
+	* tree.h: Declare them.
+
 2013-07-13  Bin Cheng  <bin.cheng@arm.com>
 
 	* ifcvt.c (ifcvt_after_combine): New static variable.
diff --git a/gcc/print-tree.c b/gcc/print-tree.c
index 689eeb9fe52..029c3a25e6d 100644
--- a/gcc/print-tree.c
+++ b/gcc/print-tree.c
@@ -1097,26 +1097,37 @@ debug_body (const tree_node *ptr)
    down to a depth of six.  */
 
 DEBUG_FUNCTION void
-debug_vec_tree (vec<tree, va_gc> *vec)
+debug_raw (vec<tree, va_gc> &ref)
 {
   tree elt;
   unsigned ix;
 
   /* Print the slot this node is in, and its code, and address.  */
   fprintf (stderr, "<VEC");
-  dump_addr (stderr, " ", vec->address ());
+  dump_addr (stderr, " ", ref.address ());
 
-  FOR_EACH_VEC_ELT (*vec, ix, elt)
+  FOR_EACH_VEC_ELT (ref, ix, elt)
     {
       fprintf (stderr, "elt %d ", ix);
-      debug (elt);
+      debug_raw (elt);
     }
 }
 
 DEBUG_FUNCTION void
 debug (vec<tree, va_gc> &ref)
 {
-  debug_vec_tree (&ref);
+  tree elt;
+  unsigned ix;
+
+  /* Print the slot this node is in, and its code, and address.  */
+  fprintf (stderr, "<VEC");
+  dump_addr (stderr, " ", ref.address ());
+
+  FOR_EACH_VEC_ELT (ref, ix, elt)
+    {
+      fprintf (stderr, "elt %d ", ix);
+      debug (elt);
+    }
 }
 
 DEBUG_FUNCTION void
@@ -1127,3 +1138,18 @@ debug (vec<tree, va_gc> *ptr)
   else
     fprintf (stderr, "<nil>\n");
 }
+
+DEBUG_FUNCTION void
+debug_raw (vec<tree, va_gc> *ptr)
+{
+  if (ptr)
+    debug_raw (*ptr);
+  else
+    fprintf (stderr, "<nil>\n");
+}
+
+DEBUG_FUNCTION void
+debug_vec_tree (vec<tree, va_gc> *vec)
+{
+  debug_raw (vec);
+}
diff --git a/gcc/tree.h b/gcc/tree.h
index 6297b49c399..0058a4b17bf 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -6025,6 +6025,8 @@ extern void debug_body (const tree_node *ptr);
 extern void debug_vec_tree (vec<tree, va_gc> *);
 extern void debug (vec<tree, va_gc> &ref);
 extern void debug (vec<tree, va_gc> *ptr);
+extern void debug_raw (vec<tree, va_gc> &ref);
+extern void debug_raw (vec<tree, va_gc> *ptr);
 #ifdef BUFSIZ
 extern void dump_addr (FILE*, const char *, const void *);
 extern void print_node (FILE *, const char *, tree, int);
-- 
2.30.2