2008-05-16 Kenneth Zadeck <zadeck@naturalbridge.com>

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

diff --git a/gcc/tree-pretty-print.c b/gcc/tree-pretty-print.c
index 62b5899..811c195 100644 (file)
--- a/gcc/tree-pretty-print.c
+++ b/gcc/tree-pretty-print.c
@@ -1,5 +1,5 @@
 /* Pretty formatting of GENERIC trees in C syntax.
 /* Pretty formatting of GENERIC trees in C syntax.

-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008

    Free Software Foundation, Inc.
    Adapted from c-pretty-print.c by Diego Novillo <dnovillo@redhat.com>
 
    Free Software Foundation, Inc.
    Adapted from c-pretty-print.c by Diego Novillo <dnovillo@redhat.com>
 


@@ -7,7 +7,7 @@ This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

-Software Foundation; either version 2, or (at your option) any later
+Software Foundation; either version 3, or (at your option) any later

 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY
 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY


@@ -16,15 +16,15 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA.  */
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */

 
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
 #include "tree.h"
 
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
 #include "tree.h"

+#include "output.h"

 #include "diagnostic.h"
 #include "real.h"
 #include "hashtab.h"
 #include "diagnostic.h"
 #include "real.h"
 #include "hashtab.h"


@@ -33,18 +33,20 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 #include "tree-iterator.h"
 #include "tree-chrec.h"
 #include "tree-pass.h"
 #include "tree-iterator.h"
 #include "tree-chrec.h"
 #include "tree-pass.h"

+#include "fixed-value.h"
+#include "value-prof.h"
+#include "predict.h"

 
 /* Local functions, macros and variables.  */
 
 /* Local functions, macros and variables.  */

-static int op_prio (tree);
-static const char *op_symbol_1 (enum tree_code);
-static const char *op_symbol (tree);
+static int op_prio (const_tree);
+static const char *op_symbol (const_tree);

 static void pretty_print_string (pretty_printer *, const char*);
 static void pretty_print_string (pretty_printer *, const char*);

-static void print_call_name (pretty_printer *, tree);
+static void print_call_name (pretty_printer *, const_tree);

 static void newline_and_indent (pretty_printer *, int);
 static void maybe_init_pretty_print (FILE *);
 static void print_declaration (pretty_printer *, tree, int, int);
 static void newline_and_indent (pretty_printer *, int);
 static void maybe_init_pretty_print (FILE *);
 static void print_declaration (pretty_printer *, tree, int, int);

-static void print_struct_decl (pretty_printer *, tree, int, int);
-static void do_niy (pretty_printer *, tree);
+static void print_struct_decl (pretty_printer *, const_tree, int, int);
+static void do_niy (pretty_printer *, const_tree);

 static void dump_vops (pretty_printer *, tree, int, int);
 static void dump_generic_bb_buff (pretty_printer *, basic_block, int, int);
 
 static void dump_vops (pretty_printer *, tree, int, int);
 static void dump_generic_bb_buff (pretty_printer *, basic_block, int, int);
 


@@ -64,7 +66,7 @@ static int initialized = 0;
 /* Try to print something for an unknown tree code.  */
 
 static void
 /* Try to print something for an unknown tree code.  */
 
 static void

-do_niy (pretty_printer *buffer, tree node)
+do_niy (pretty_printer *buffer, const_tree node)

 {
   int i, len;
 
 {
   int i, len;
 


@@ -73,7 +75,7 @@ do_niy (pretty_printer *buffer, tree node)
 
   if (EXPR_P (node))
     {
 
   if (EXPR_P (node))
     {

-      len = TREE_CODE_LENGTH (TREE_CODE (node));
+      len = TREE_OPERAND_LENGTH (node);

       for (i = 0; i < len; ++i)
        {
          newline_and_indent (buffer, 2);
       for (i = 0; i < len; ++i)
        {
          newline_and_indent (buffer, 2);


@@ -84,24 +86,35 @@ do_niy (pretty_printer *buffer, tree node)
   pp_string (buffer, " >>>\n");
 }
 
   pp_string (buffer, " >>>\n");
 }
 

+/* Debugging function to print out a generic expression.  */
+

 void
 debug_generic_expr (tree t)
 {
 void
 debug_generic_expr (tree t)
 {

-  print_generic_expr (stderr, t, TDF_VOPS|TDF_UID);
+  print_generic_expr (stderr, t, TDF_VOPS|TDF_MEMSYMS);

   fprintf (stderr, "\n");
 }
 
   fprintf (stderr, "\n");
 }
 

+/* Debugging function to print out a generic statement.  */
+

 void
 debug_generic_stmt (tree t)
 {
 void
 debug_generic_stmt (tree t)
 {

-  print_generic_stmt (stderr, t, TDF_VOPS|TDF_UID);
+  print_generic_stmt (stderr, t, TDF_VOPS|TDF_MEMSYMS);

   fprintf (stderr, "\n");
 }
 
   fprintf (stderr, "\n");
 }
 

+/* Debugging function to print out a chain of trees .  */
+

 void
 debug_tree_chain (tree t)
 {
 void
 debug_tree_chain (tree t)
 {

-  print_generic_expr (stderr, t, TDF_VOPS|TDF_UID|TDF_CHAIN);
+  while (t)
+  {
+    print_generic_expr (stderr, t, TDF_VOPS|TDF_MEMSYMS|TDF_UID);
+    fprintf(stderr, " ");
+    t = TREE_CHAIN (t);
+  }

   fprintf (stderr, "\n");
 }
 
   fprintf (stderr, "\n");
 }
 


@@ -115,7 +128,7 @@ print_generic_decl (FILE *file, tree decl, int flags)
 }
 
 /* Print tree T, and its successors, on file FILE.  FLAGS specifies details
 }
 
 /* Print tree T, and its successors, on file FILE.  FLAGS specifies details

-   to show in the dump.  See TDF_* in tree.h.  */
+   to show in the dump.  See TDF_* in tree-pass.h.  */

 
 void
 print_generic_stmt (FILE *file, tree t, int flags)
 
 void
 print_generic_stmt (FILE *file, tree t, int flags)


@@ -126,7 +139,7 @@ print_generic_stmt (FILE *file, tree t, int flags)
 }
 
 /* Print tree T, and its successors, on file FILE.  FLAGS specifies details
 }
 
 /* Print tree T, and its successors, on file FILE.  FLAGS specifies details

-   to show in the dump.  See TDF_* in tree.h.  The output is indented by
+   to show in the dump.  See TDF_* in tree-pass.h.  The output is indented by

    INDENT spaces.  */
 
 void
    INDENT spaces.  */
 
 void


@@ -143,7 +156,7 @@ print_generic_stmt_indented (FILE *file, tree t, int flags, int indent)
 }
 
 /* Print a single expression T on file FILE.  FLAGS specifies details to show
 }
 
 /* Print a single expression T on file FILE.  FLAGS specifies details to show

-   in the dump.  See TDF_* in tree.h.  */
+   in the dump.  See TDF_* in tree-pass.h.  */

 
 void
 print_generic_expr (FILE *file, tree t, int flags)
 
 void
 print_generic_expr (FILE *file, tree t, int flags)


@@ -160,32 +173,19 @@ dump_decl_name (pretty_printer *buffer, tree node, int flags)
 {
   tree t = node;
 
 {
   tree t = node;
 

-  while (t)
+  if (DECL_NAME (t))
+    pp_tree_identifier (buffer, DECL_NAME (t));
+  if ((flags & TDF_UID)
+      || DECL_NAME (t) == NULL_TREE)

     {
     {

-      if (DECL_NAME (t))
-       pp_tree_identifier (buffer, DECL_NAME (t));
-
-      if ((flags & TDF_UID)
-         || DECL_NAME (t) == NULL_TREE)
-       {
-         if (TREE_CODE (t) == LABEL_DECL
-             && LABEL_DECL_UID (t) != -1)
-           pp_printf (buffer, "L." HOST_WIDE_INT_PRINT_DEC,
-               LABEL_DECL_UID (t));
-         else
-           {
-             char c = TREE_CODE (t) == CONST_DECL ? 'C' : 'D';
-             pp_printf (buffer, "%c.%u", c, DECL_UID (t));
-           }
-       }
-
-      if (flags & TDF_CHAIN)
+      if (TREE_CODE (t) == LABEL_DECL
+          && LABEL_DECL_UID (t) != -1)
+        pp_printf (buffer, "L.%d", (int) LABEL_DECL_UID (t));
+      else

        {
        {

-         t = TREE_CHAIN (t);
-         pp_string (buffer, " ");
+         char c = TREE_CODE (t) == CONST_DECL ? 'C' : 'D';
+         pp_printf (buffer, "%c.%u", c, DECL_UID (t));

        }
        }

-      else
-       t = NULL_TREE;

     }
 }
 
     }
 }
 


@@ -302,7 +302,7 @@ dump_omp_clause (pretty_printer *buffer, tree clause, int spc, int flags)
 
     case OMP_CLAUSE_REDUCTION:
       pp_string (buffer, "reduction(");
 
     case OMP_CLAUSE_REDUCTION:
       pp_string (buffer, "reduction(");

-      pp_string (buffer, op_symbol_1 (OMP_CLAUSE_REDUCTION_CODE (clause)));
+      pp_string (buffer, op_symbol_code (OMP_CLAUSE_REDUCTION_CODE (clause)));

       pp_character (buffer, ':');
       dump_generic_node (buffer, OMP_CLAUSE_DECL (clause),
          spc, flags, false);
       pp_character (buffer, ':');
       dump_generic_node (buffer, OMP_CLAUSE_DECL (clause),
          spc, flags, false);


@@ -409,10 +409,37 @@ dump_omp_clauses (pretty_printer *buffer, tree clause, int spc, int flags)
 }
 
 
 }
 
 

-/* Dump the node NODE on the pretty_printer BUFFER, SPC spaces of indent.
-   FLAGS specifies details to show in the dump (see TDF_* in tree.h).  If
-   IS_STMT is true, the object printed is considered to be a statement
-   and it is terminated by ';' if appropriate.  */
+/* Dump the set of decls SYMS.  BUFFER, SPC and FLAGS are as in
+   dump_generic_node.  */
+
+static void
+dump_symbols (pretty_printer *buffer, bitmap syms, int flags)
+{
+  unsigned i;
+  bitmap_iterator bi;
+
+  if (syms == NULL)
+    pp_string (buffer, "NIL");
+  else
+    {
+      pp_string (buffer, " { ");
+
+      EXECUTE_IF_SET_IN_BITMAP (syms, 0, i, bi)
+       {
+         tree sym = referenced_var_lookup (i);
+         dump_generic_node (buffer, sym, 0, flags, false);
+         pp_string (buffer, " ");
+       }
+
+      pp_string (buffer, "}");
+    }
+}
+
+
+/* Dump the node NODE on the pretty_printer BUFFER, SPC spaces of
+   indent.  FLAGS specifies details to show in the dump (see TDF_* in
+   tree-pass.h).  If IS_STMT is true, the object printed is considered
+   to be a statement and it is terminated by ';' if appropriate.  */

 
 int
 dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
 
 int
 dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,


@@ -426,12 +453,16 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
   if (node == NULL_TREE)
     return spc;
 
   if (node == NULL_TREE)
     return spc;
 

-  is_expr = EXPR_P (node);
+  is_expr = EXPR_P (node) || GIMPLE_STMT_P (node);

 
 

+  /* We use has_stmt_ann because CALL_EXPR can be both an expression
+     and a statement, and we have no guarantee that it will have a
+     stmt_ann when it is used as an RHS expression.  stmt_ann will assert
+     if you call it on something with a non-stmt annotation attached.  */

   if (TREE_CODE (node) != ERROR_MARK
       && is_gimple_stmt (node)
   if (TREE_CODE (node) != ERROR_MARK
       && is_gimple_stmt (node)

-      && (flags & TDF_VOPS)
-      && stmt_ann (node)
+      && (flags & (TDF_VOPS|TDF_MEMSYMS))
+      && has_stmt_ann (node)

       && TREE_CODE (node) != PHI_NODE)
     dump_vops (buffer, node, spc, flags);
 
       && TREE_CODE (node) != PHI_NODE)
     dump_vops (buffer, node, spc, flags);
 


@@ -504,11 +535,11 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
     case VOID_TYPE:
     case INTEGER_TYPE:
     case REAL_TYPE:
     case VOID_TYPE:
     case INTEGER_TYPE:
     case REAL_TYPE:

+    case FIXED_POINT_TYPE:

     case COMPLEX_TYPE:
     case VECTOR_TYPE:
     case ENUMERAL_TYPE:
     case BOOLEAN_TYPE:
     case COMPLEX_TYPE:
     case VECTOR_TYPE:
     case ENUMERAL_TYPE:
     case BOOLEAN_TYPE:

-    case CHAR_TYPE:

       {
        unsigned int quals = TYPE_QUALS (node);
        enum tree_code_class class;
       {
        unsigned int quals = TYPE_QUALS (node);
        enum tree_code_class class;


@@ -547,6 +578,14 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
                dump_generic_node (buffer, TREE_TYPE (node), 
                                   spc, flags, false);
              }
                dump_generic_node (buffer, TREE_TYPE (node), 
                                   spc, flags, false);
              }

+           else if (TREE_CODE (node) == INTEGER_TYPE)
+             {
+               pp_string (buffer, (TYPE_UNSIGNED (node)
+                                   ? "<unnamed-unsigned:"
+                                   : "<unnamed-signed:"));
+               pp_decimal_int (buffer, TYPE_PRECISION (node));
+               pp_string (buffer, ">");
+             }

            else
               pp_string (buffer, "<unnamed type>");
          }
            else
               pp_string (buffer, "<unnamed type>");
          }


@@ -583,9 +622,9 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
 
          if (quals & TYPE_QUAL_CONST)
            pp_string (buffer, " const");
 
          if (quals & TYPE_QUAL_CONST)
            pp_string (buffer, " const");

-         else if (quals & TYPE_QUAL_VOLATILE)
-           pp_string (buffer,  "volatile");
-         else if (quals & TYPE_QUAL_RESTRICT)
+         if (quals & TYPE_QUAL_VOLATILE)
+           pp_string (buffer, " volatile");
+         if (quals & TYPE_QUAL_RESTRICT)

            pp_string (buffer, " restrict");
 
          if (TYPE_REF_CAN_ALIAS_ALL (node))
            pp_string (buffer, " restrict");
 
          if (TYPE_REF_CAN_ALIAS_ALL (node))


@@ -679,17 +718,26 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
     case RECORD_TYPE:
     case UNION_TYPE:
     case QUAL_UNION_TYPE:
     case RECORD_TYPE:
     case UNION_TYPE:
     case QUAL_UNION_TYPE:

-      /* Print the name of the structure.  */
-      if (TREE_CODE (node) == RECORD_TYPE)
-       pp_string (buffer, "struct ");
-      else if (TREE_CODE (node) == UNION_TYPE)
-       pp_string (buffer, "union ");
+      {
+       unsigned int quals = TYPE_QUALS (node);

 
 

-      if (TYPE_NAME (node))
-       dump_generic_node (buffer, TYPE_NAME (node), spc, flags, false);
-      else
-       print_struct_decl (buffer, node, spc, flags);
-      break;
+       if (quals & TYPE_QUAL_CONST)
+         pp_string (buffer, "const ");
+       if (quals & TYPE_QUAL_VOLATILE)
+         pp_string (buffer, "volatile ");
+
+        /* Print the name of the structure.  */
+        if (TREE_CODE (node) == RECORD_TYPE)
+         pp_string (buffer, "struct ");
+        else if (TREE_CODE (node) == UNION_TYPE)
+         pp_string (buffer, "union ");
+
+        if (TYPE_NAME (node))
+         dump_generic_node (buffer, TYPE_NAME (node), spc, flags, false);
+        else
+         print_struct_decl (buffer, node, spc, flags);
+        break;
+      }

 
     case LANG_TYPE:
       NIY;
 
     case LANG_TYPE:
       NIY;


@@ -724,26 +772,21 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
       else if (! host_integerp (node, 0))
        {
          tree val = node;
       else if (! host_integerp (node, 0))
        {
          tree val = node;

+         unsigned HOST_WIDE_INT low = TREE_INT_CST_LOW (val);
+         HOST_WIDE_INT high = TREE_INT_CST_HIGH (val);

 
          if (tree_int_cst_sgn (val) < 0)
            {
              pp_character (buffer, '-');
 
          if (tree_int_cst_sgn (val) < 0)
            {
              pp_character (buffer, '-');

-             val = build_int_cst_wide (NULL_TREE,
-                                       -TREE_INT_CST_LOW (val),
-                                       ~TREE_INT_CST_HIGH (val)
-                                       + !TREE_INT_CST_LOW (val));
+             high = ~high + !low;
+             low = -low;

            }
          /* Would "%x%0*x" or "%x%*0x" get zero-padding on all
             systems?  */
            }
          /* Would "%x%0*x" or "%x%*0x" get zero-padding on all
             systems?  */

-         {
-           static char format[10]; /* "%x%09999x\0" */
-           if (!format[0])
-             sprintf (format, "%%x%%0%dx", HOST_BITS_PER_INT / 4);
-           sprintf (pp_buffer (buffer)->digit_buffer, format,
-                    TREE_INT_CST_HIGH (val),
-                    TREE_INT_CST_LOW (val));
-           pp_string (buffer, pp_buffer (buffer)->digit_buffer);
-         }
+         sprintf (pp_buffer (buffer)->digit_buffer,
+                  HOST_WIDE_INT_PRINT_DOUBLE_HEX,
+                  (unsigned HOST_WIDE_INT) high, low);
+         pp_string (buffer, pp_buffer (buffer)->digit_buffer);

        }
       else
        pp_wide_integer (buffer, TREE_INT_CST_LOW (node));
        }
       else
        pp_wide_integer (buffer, TREE_INT_CST_LOW (node));


@@ -759,7 +802,7 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
 #if !defined(REAL_IS_NOT_DOUBLE) || defined(REAL_ARITHMETIC)
        d = TREE_REAL_CST (node);
        if (REAL_VALUE_ISINF (d))
 #if !defined(REAL_IS_NOT_DOUBLE) || defined(REAL_ARITHMETIC)
        d = TREE_REAL_CST (node);
        if (REAL_VALUE_ISINF (d))

-         pp_string (buffer, " Inf");
+         pp_string (buffer, REAL_VALUE_NEGATIVE (d) ? " -Inf" : " Inf");

        else if (REAL_VALUE_ISNAN (d))
          pp_string (buffer, " Nan");
        else
        else if (REAL_VALUE_ISNAN (d))
          pp_string (buffer, " Nan");
        else


@@ -780,6 +823,14 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
        break;
       }
 
        break;
       }
 

+    case FIXED_CST:
+      {
+       char string[100];
+       fixed_to_decimal (string, TREE_FIXED_CST_PTR (node), sizeof (string));
+       pp_string (buffer, string);
+       break;
+      }
+

     case COMPLEX_CST:
       pp_string (buffer, "__complex__ (");
       dump_generic_node (buffer, TREE_REALPART (node), spc, flags, false);
     case COMPLEX_CST:
       pp_string (buffer, "__complex__ (");
       dump_generic_node (buffer, TREE_REALPART (node), spc, flags, false);


@@ -820,10 +871,9 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
       if (DECL_NAME (node))
        dump_decl_name (buffer, node, flags);
       else if (LABEL_DECL_UID (node) != -1)
       if (DECL_NAME (node))
        dump_decl_name (buffer, node, flags);
       else if (LABEL_DECL_UID (node) != -1)

-        pp_printf (buffer, "<L" HOST_WIDE_INT_PRINT_DEC ">",
-                  LABEL_DECL_UID (node));
+        pp_printf (buffer, "<L%d>", (int) LABEL_DECL_UID (node));

       else
       else

-        pp_printf (buffer, "<D%u>", DECL_UID (node));
+        pp_printf (buffer, "<D.%u>", DECL_UID (node));

       break;
 
     case TYPE_DECL:
       break;
 
     case TYPE_DECL:


@@ -855,13 +905,13 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
        }
       break;
 
        }
       break;
 

-    case TYPE_MEMORY_TAG:
+    case SYMBOL_MEMORY_TAG:

     case NAME_MEMORY_TAG:
     case NAME_MEMORY_TAG:

-    case STRUCT_FIELD_TAG:

     case VAR_DECL:
     case PARM_DECL:
     case FIELD_DECL:
     case NAMESPACE_DECL:
     case VAR_DECL:
     case PARM_DECL:
     case FIELD_DECL:
     case NAMESPACE_DECL:

+    case MEMORY_PARTITION_TAG:

       dump_decl_name (buffer, node, flags);
       break;
 
       dump_decl_name (buffer, node, flags);
       break;
 


@@ -925,8 +975,8 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
       op1 = array_ref_element_size (node);
 
       if (!integer_zerop (op0)
       op1 = array_ref_element_size (node);
 
       if (!integer_zerop (op0)

-         || (TYPE_SIZE_UNIT (TREE_TYPE (node))
-             && !operand_equal_p (op1, TYPE_SIZE_UNIT (TREE_TYPE (node)), 0)))
+         || TREE_OPERAND (node, 2)
+         || TREE_OPERAND (node, 3))

        {
          pp_string (buffer, "{lb: ");
          dump_generic_node (buffer, op0, spc, flags, false);
        {
          pp_string (buffer, "{lb: ");
          dump_generic_node (buffer, op0, spc, flags, false);


@@ -1031,12 +1081,25 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
       break;
 
     case MODIFY_EXPR:
       break;
 
     case MODIFY_EXPR:

+    case GIMPLE_MODIFY_STMT:

     case INIT_EXPR:
     case INIT_EXPR:

-      dump_generic_node (buffer, TREE_OPERAND (node, 0), spc, flags, false);
+      dump_generic_node (buffer, GENERIC_TREE_OPERAND (node, 0), spc, flags,
+                        false);

       pp_space (buffer);
       pp_character (buffer, '=');
       pp_space (buffer);
       pp_character (buffer, '=');

+      if (TREE_CODE (node) == GIMPLE_MODIFY_STMT
+         && MOVE_NONTEMPORAL (node))
+       pp_string (buffer, "{nt}");
+      if (TREE_CODE (node) == GIMPLE_MODIFY_STMT)
+       {
+       stmt_ann_t ann;
+        if ((ann = stmt_ann (node))
+           && ann->has_volatile_ops)
+         pp_string (buffer, "{v}");
+        }

       pp_space (buffer);
       pp_space (buffer);

-      dump_generic_node (buffer, TREE_OPERAND (node, 1), spc, flags, false);
+      dump_generic_node (buffer, GENERIC_TREE_OPERAND (node, 1), spc, flags,
+                        false);

       break;
 
     case TARGET_EXPR:
       break;
 
     case TARGET_EXPR:


@@ -1068,9 +1131,14 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
                  || TREE_CODE (COND_EXPR_ELSE (node)) == GOTO_EXPR))
            {
              pp_space (buffer);
                  || TREE_CODE (COND_EXPR_ELSE (node)) == GOTO_EXPR))
            {
              pp_space (buffer);

-             dump_generic_node (buffer, COND_EXPR_THEN (node), 0, flags, true);
-             pp_string (buffer, " else ");
-             dump_generic_node (buffer, COND_EXPR_ELSE (node), 0, flags, true);
+             dump_generic_node (buffer, COND_EXPR_THEN (node),
+                                0, flags, true);
+             if (!IS_EMPTY_STMT (COND_EXPR_ELSE (node)))
+               {
+                 pp_string (buffer, " else ");
+                 dump_generic_node (buffer, COND_EXPR_ELSE (node),
+                                    0, flags, true);
+               }

            }
          else if (!(flags & TDF_SLIM))
            {
            }
          else if (!(flags & TDF_SLIM))
            {


@@ -1087,7 +1155,8 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
                }
 
              /* Output COND_EXPR_ELSE.  */
                }
 
              /* Output COND_EXPR_ELSE.  */

-             if (COND_EXPR_ELSE (node))
+             if (COND_EXPR_ELSE (node)
+                 && !IS_EMPTY_STMT (COND_EXPR_ELSE (node)))

                {
                  newline_and_indent (buffer, spc);
                  pp_string (buffer, "else");
                {
                  newline_and_indent (buffer, spc);
                  pp_string (buffer, "else");


@@ -1145,12 +1214,31 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
       /* Print parameters.  */
       pp_space (buffer);
       pp_character (buffer, '(');
       /* Print parameters.  */
       pp_space (buffer);
       pp_character (buffer, '(');

-      op1 = TREE_OPERAND (node, 1);
-      if (op1)
-       dump_generic_node (buffer, op1, spc, flags, false);
+      {
+       tree arg;
+       call_expr_arg_iterator iter;
+       FOR_EACH_CALL_EXPR_ARG (arg, iter, node)
+         {
+           dump_generic_node (buffer, arg, spc, flags, false);
+           if (more_call_expr_args_p (&iter))
+             {
+               pp_character (buffer, ',');
+               pp_space (buffer);
+             }
+         }
+      }
+      if (CALL_EXPR_VA_ARG_PACK (node))
+       {
+         if (call_expr_nargs (node) > 0)
+           {
+             pp_character (buffer, ',');
+             pp_space (buffer);
+           }
+         pp_string (buffer, "__builtin_va_arg_pack ()");
+       }

       pp_character (buffer, ')');
 
       pp_character (buffer, ')');
 

-      op1 = TREE_OPERAND (node, 2);
+      op1 = CALL_EXPR_STATIC_CHAIN (node);

       if (op1)
        {
          pp_string (buffer, " [static-chain: ");
       if (op1)
        {
          pp_string (buffer, " [static-chain: ");


@@ -1185,6 +1273,7 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
     case WIDEN_MULT_EXPR:
     case MULT_EXPR:
     case PLUS_EXPR:
     case WIDEN_MULT_EXPR:
     case MULT_EXPR:
     case PLUS_EXPR:

+    case POINTER_PLUS_EXPR:

     case MINUS_EXPR:
     case TRUNC_DIV_EXPR:
     case CEIL_DIV_EXPR:
     case MINUS_EXPR:
     case TRUNC_DIV_EXPR:
     case CEIL_DIV_EXPR:


@@ -1231,7 +1320,7 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
 
        /* When the operands are expressions with less priority,
           keep semantics of the tree representation.  */
 
        /* When the operands are expressions with less priority,
           keep semantics of the tree representation.  */

-       if (op_prio (op0) < op_prio (node))
+       if (op_prio (op0) <= op_prio (node))

          {
            pp_character (buffer, '(');
            dump_generic_node (buffer, op0, spc, flags, false);
          {
            pp_character (buffer, '(');
            dump_generic_node (buffer, op0, spc, flags, false);


@@ -1246,7 +1335,7 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
 
        /* When the operands are expressions with less priority,
           keep semantics of the tree representation.  */
 
        /* When the operands are expressions with less priority,
           keep semantics of the tree representation.  */

-       if (op_prio (op1) < op_prio (node))
+       if (op_prio (op1) <= op_prio (node))

          {
            pp_character (buffer, '(');
            dump_generic_node (buffer, op1, spc, flags, false);
          {
            pp_character (buffer, '(');
            dump_generic_node (buffer, op1, spc, flags, false);


@@ -1330,13 +1419,10 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
       NIY;
       break;
 
       NIY;
       break;
 

+    case FIXED_CONVERT_EXPR:

     case FIX_TRUNC_EXPR:
     case FIX_TRUNC_EXPR:

-    case FIX_CEIL_EXPR:
-    case FIX_FLOOR_EXPR:
-    case FIX_ROUND_EXPR:

     case FLOAT_EXPR:
     case FLOAT_EXPR:

-    case CONVERT_EXPR:
-    case NOP_EXPR:
+    CASE_CONVERT:

       type = TREE_TYPE (node);
       op0 = TREE_OPERAND (node, 0);
       if (type != TREE_TYPE (op0))
       type = TREE_TYPE (node);
       op0 = TREE_OPERAND (node, 0);
       if (type != TREE_TYPE (op0))


@@ -1360,6 +1446,12 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
       pp_character (buffer, ')');
       break;
 
       pp_character (buffer, ')');
       break;
 

+    case PAREN_EXPR:
+      pp_string (buffer, "((");
+      dump_generic_node (buffer, TREE_OPERAND (node, 0), spc, flags, false);
+      pp_string (buffer, "))");
+      break;
+

     case NON_LVALUE_EXPR:
       pp_string (buffer, "NON_LVALUE_EXPR <");
       dump_generic_node (buffer, TREE_OPERAND (node, 0), spc, flags, false);
     case NON_LVALUE_EXPR:
       pp_string (buffer, "NON_LVALUE_EXPR <");
       dump_generic_node (buffer, TREE_OPERAND (node, 0), spc, flags, false);


@@ -1451,6 +1543,17 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
       is_expr = false;
       break;
 
       is_expr = false;
       break;
 

+    case CHANGE_DYNAMIC_TYPE_EXPR:
+      pp_string (buffer, "<<<change_dynamic_type (");
+      dump_generic_node (buffer, CHANGE_DYNAMIC_TYPE_NEW_TYPE (node), spc + 2,
+                        flags, false);
+      pp_string (buffer, ") ");
+      dump_generic_node (buffer, CHANGE_DYNAMIC_TYPE_LOCATION (node), spc + 2,
+                        flags, false);
+      pp_string (buffer, ")>>>");
+      is_expr = false;
+      break;
+

     case LABEL_EXPR:
       op0 = TREE_OPERAND (node, 0);
       /* If this is for break or continue, don't bother printing it.  */
     case LABEL_EXPR:
       op0 = TREE_OPERAND (node, 0);
       /* If this is for break or continue, don't bother printing it.  */


@@ -1489,14 +1592,26 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
       is_expr = false;
       break;
 
       is_expr = false;
       break;
 

+    case PREDICT_EXPR:
+      pp_string (buffer, "// predicted ");
+      if (PREDICT_EXPR_OUTCOME (node))
+        pp_string (buffer, "likely by ");
+      else
+        pp_string (buffer, "unlikely by ");
+      pp_string (buffer, predictor_name (PREDICT_EXPR_PREDICTOR (node)));
+      pp_string (buffer, " predictor.");
+      break;
+

     case RETURN_EXPR:
       pp_string (buffer, "return");
       op0 = TREE_OPERAND (node, 0);
       if (op0)
        {
          pp_space (buffer);
     case RETURN_EXPR:
       pp_string (buffer, "return");
       op0 = TREE_OPERAND (node, 0);
       if (op0)
        {
          pp_space (buffer);

-         if (TREE_CODE (op0) == MODIFY_EXPR)
-           dump_generic_node (buffer, TREE_OPERAND (op0, 1), spc, flags, false);
+         if (TREE_CODE (op0) == MODIFY_EXPR
+             || TREE_CODE (op0) == GIMPLE_MODIFY_STMT)
+           dump_generic_node (buffer, GENERIC_TREE_OPERAND (op0, 1),
+                              spc, flags, false);

          else
            dump_generic_node (buffer, op0, spc, flags, false);
        }
          else
            dump_generic_node (buffer, op0, spc, flags, false);
        }


@@ -1565,8 +1680,8 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
       break;
 
     case RESX_EXPR:
       break;
 
     case RESX_EXPR:

-      pp_string (buffer, "resx");
-      /* ??? Any sensible way to present the eh region?  */
+      pp_string (buffer, "resx ");
+      dump_generic_node (buffer, TREE_OPERAND (node, 0), spc, flags, false);

       break;
 
     case ASM_EXPR:
       break;
 
     case ASM_EXPR:


@@ -1631,7 +1746,10 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
            if (i < PHI_NUM_ARGS (node) - 1)
              pp_string (buffer, ", ");
          }
            if (i < PHI_NUM_ARGS (node) - 1)
              pp_string (buffer, ", ");
          }

-       pp_string (buffer, ">;");
+       pp_string (buffer, ">");
+
+       if (stmt_references_memory_p (node) && (flags & TDF_MEMSYMS))
+         dump_symbols (buffer, STORED_SYMS (node), flags);

       }
       break;
 
       }
       break;
 


@@ -1641,6 +1759,8 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
       pp_decimal_int (buffer, SSA_NAME_VERSION (node));
       if (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (node))
        pp_string (buffer, "(ab)");
       pp_decimal_int (buffer, SSA_NAME_VERSION (node));
       if (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (node))
        pp_string (buffer, "(ab)");

+      else if (SSA_NAME_IS_DEFAULT_DEF (node))
+       pp_string (buffer, "(D)");

       break;
 
     case WITH_SIZE_EXPR:
       break;
 
     case WITH_SIZE_EXPR:


@@ -1704,9 +1824,9 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
     case DOT_PROD_EXPR:
       pp_string (buffer, " DOT_PROD_EXPR < ");
       dump_generic_node (buffer, TREE_OPERAND (node, 0), spc, flags, false);
     case DOT_PROD_EXPR:
       pp_string (buffer, " DOT_PROD_EXPR < ");
       dump_generic_node (buffer, TREE_OPERAND (node, 0), spc, flags, false);

-      pp_string (buffer, " , ");
+      pp_string (buffer, ", ");

       dump_generic_node (buffer, TREE_OPERAND (node, 1), spc, flags, false);
       dump_generic_node (buffer, TREE_OPERAND (node, 1), spc, flags, false);

-      pp_string (buffer, " , ");
+      pp_string (buffer, ", ");

       dump_generic_node (buffer, TREE_OPERAND (node, 2), spc, flags, false);
       pp_string (buffer, " > ");
       break;
       dump_generic_node (buffer, TREE_OPERAND (node, 2), spc, flags, false);
       pp_string (buffer, " > ");
       break;


@@ -1788,9 +1908,21 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
 
     case OMP_SECTIONS:
       pp_string (buffer, "#pragma omp sections");
 
     case OMP_SECTIONS:
       pp_string (buffer, "#pragma omp sections");

+      if (OMP_SECTIONS_CONTROL (node))
+       {
+         pp_string (buffer, " <");
+         dump_generic_node (buffer, OMP_SECTIONS_CONTROL (node), spc,
+                            flags, false);
+         pp_string (buffer, ">");
+       }

       dump_omp_clauses (buffer, OMP_SECTIONS_CLAUSES (node), spc, flags);
       goto dump_omp_body;
 
       dump_omp_clauses (buffer, OMP_SECTIONS_CLAUSES (node), spc, flags);
       goto dump_omp_body;
 

+    case OMP_SECTIONS_SWITCH:
+      pp_string (buffer, "OMP_SECTIONS_SWITCH");
+      is_expr = false;
+      break;
+ 

     case OMP_SECTION:
       pp_string (buffer, "#pragma omp section");
       goto dump_omp_body;
     case OMP_SECTION:
       pp_string (buffer, "#pragma omp section");
       goto dump_omp_body;


@@ -1825,13 +1957,41 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
       dump_generic_node (buffer, TREE_OPERAND (node, 1), spc, flags, false);
       break;
 
       dump_generic_node (buffer, TREE_OPERAND (node, 1), spc, flags, false);
       break;
 

+    case OMP_ATOMIC_LOAD:
+      pp_string (buffer, "#pragma omp atomic_load");
+      newline_and_indent (buffer, spc + 2);
+      dump_generic_node (buffer, TREE_OPERAND (node, 0), spc, flags, false);
+      pp_space (buffer);
+      pp_character (buffer, '=');
+      pp_space (buffer);
+      pp_character (buffer, '*');
+      dump_generic_node (buffer, TREE_OPERAND (node, 1), spc, flags, false);
+      break;
+
+    case OMP_ATOMIC_STORE:
+      pp_string (buffer, "#pragma omp atomic_store (");
+      dump_generic_node (buffer, TREE_OPERAND (node, 0), spc, flags, false);
+      pp_character (buffer, ')');
+      break;
+

     case OMP_SINGLE:
       pp_string (buffer, "#pragma omp single");
       dump_omp_clauses (buffer, OMP_SINGLE_CLAUSES (node), spc, flags);
       goto dump_omp_body;
 
     case OMP_SINGLE:
       pp_string (buffer, "#pragma omp single");
       dump_omp_clauses (buffer, OMP_SINGLE_CLAUSES (node), spc, flags);
       goto dump_omp_body;
 

-    case OMP_RETURN_EXPR:
+    case OMP_RETURN:

       pp_string (buffer, "OMP_RETURN");
       pp_string (buffer, "OMP_RETURN");

+      if (OMP_RETURN_NOWAIT (node))
+       pp_string (buffer, " [nowait]");
+      is_expr = false;
+      break;
+
+    case OMP_CONTINUE:
+      pp_string (buffer, "OMP_CONTINUE <");
+      dump_generic_node (buffer, TREE_OPERAND (node, 0), spc, flags, false);
+      pp_string (buffer, " <- ");
+      dump_generic_node (buffer, TREE_OPERAND (node, 1), spc, flags, false);
+      pp_string (buffer, ">");

       is_expr = false;
       break;
 
       is_expr = false;
       break;
 


@@ -1858,6 +2018,70 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
       pp_string (buffer, " > ");
       break;
 
       pp_string (buffer, " > ");
       break;
 

+    case VEC_WIDEN_MULT_HI_EXPR:
+      pp_string (buffer, " VEC_WIDEN_MULT_HI_EXPR < ");
+      dump_generic_node (buffer, TREE_OPERAND (node, 0), spc, flags, false);
+      pp_string (buffer, ", ");
+      dump_generic_node (buffer, TREE_OPERAND (node, 1), spc, flags, false);
+      pp_string (buffer, " > ");
+      break;
+
+    case VEC_WIDEN_MULT_LO_EXPR:
+      pp_string (buffer, " VEC_WIDEN_MULT_LO_EXPR < ");
+      dump_generic_node (buffer, TREE_OPERAND (node, 0), spc, flags, false);
+      pp_string (buffer, ", ");
+      dump_generic_node (buffer, TREE_OPERAND (node, 1), spc, flags, false);
+      pp_string (buffer, " > ");
+      break;
+
+    case VEC_UNPACK_HI_EXPR:
+      pp_string (buffer, " VEC_UNPACK_HI_EXPR < ");
+      dump_generic_node (buffer, TREE_OPERAND (node, 0), spc, flags, false);
+      pp_string (buffer, " > ");
+      break;
+
+    case VEC_UNPACK_LO_EXPR:
+      pp_string (buffer, " VEC_UNPACK_LO_EXPR < ");
+      dump_generic_node (buffer, TREE_OPERAND (node, 0), spc, flags, false);
+      pp_string (buffer, " > ");
+      break;
+
+    case VEC_UNPACK_FLOAT_HI_EXPR:
+      pp_string (buffer, " VEC_UNPACK_FLOAT_HI_EXPR < ");
+      dump_generic_node (buffer, TREE_OPERAND (node, 0), spc, flags, false);
+      pp_string (buffer, " > ");
+      break;
+
+    case VEC_UNPACK_FLOAT_LO_EXPR:
+      pp_string (buffer, " VEC_UNPACK_FLOAT_LO_EXPR < ");
+      dump_generic_node (buffer, TREE_OPERAND (node, 0), spc, flags, false);
+      pp_string (buffer, " > ");
+      break;
+
+    case VEC_PACK_TRUNC_EXPR:
+      pp_string (buffer, " VEC_PACK_TRUNC_EXPR < ");
+      dump_generic_node (buffer, TREE_OPERAND (node, 0), spc, flags, false);
+      pp_string (buffer, ", ");
+      dump_generic_node (buffer, TREE_OPERAND (node, 1), spc, flags, false);
+      pp_string (buffer, " > ");
+      break;
+
+    case VEC_PACK_SAT_EXPR:
+      pp_string (buffer, " VEC_PACK_SAT_EXPR < ");
+      dump_generic_node (buffer, TREE_OPERAND (node, 0), spc, flags, false);
+      pp_string (buffer, ", ");
+      dump_generic_node (buffer, TREE_OPERAND (node, 1), spc, flags, false);
+      pp_string (buffer, " > ");
+      break;
+
+    case VEC_PACK_FIX_TRUNC_EXPR:
+      pp_string (buffer, " VEC_PACK_FIX_TRUNC_EXPR < ");
+      dump_generic_node (buffer, TREE_OPERAND (node, 0), spc, flags, false);
+      pp_string (buffer, ", ");
+      dump_generic_node (buffer, TREE_OPERAND (node, 1), spc, flags, false);
+      pp_string (buffer, " > ");
+      break;
+

     case BLOCK:
       {
        tree t;
     case BLOCK:
       {
        tree t;


@@ -1916,13 +2140,49 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
       }
     break;
 
       }
     break;
 

+    case VEC_EXTRACT_EVEN_EXPR:
+      pp_string (buffer, " VEC_EXTRACT_EVEN_EXPR < ");
+      dump_generic_node (buffer, TREE_OPERAND (node, 0), spc, flags, false);
+      pp_string (buffer, ", ");
+      dump_generic_node (buffer, TREE_OPERAND (node, 1), spc, flags, false);
+      pp_string (buffer, " > ");
+      break;
+  
+    case VEC_EXTRACT_ODD_EXPR:
+      pp_string (buffer, " VEC_EXTRACT_ODD_EXPR < ");
+      dump_generic_node (buffer, TREE_OPERAND (node, 0), spc, flags, false);
+      pp_string (buffer, ", ");
+      dump_generic_node (buffer, TREE_OPERAND (node, 1), spc, flags, false);
+      pp_string (buffer, " > ");
+      break;
+
+    case VEC_INTERLEAVE_HIGH_EXPR:
+      pp_string (buffer, " VEC_INTERLEAVE_HIGH_EXPR < ");
+      dump_generic_node (buffer, TREE_OPERAND (node, 0), spc, flags, false);
+      pp_string (buffer, ", ");
+      dump_generic_node (buffer, TREE_OPERAND (node, 1), spc, flags, false);
+      pp_string (buffer, " > ");
+      break;
+
+    case VEC_INTERLEAVE_LOW_EXPR:
+      pp_string (buffer, " VEC_INTERLEAVE_LOW_EXPR < ");
+      dump_generic_node (buffer, TREE_OPERAND (node, 0), spc, flags, false);
+      pp_string (buffer, ", ");
+      dump_generic_node (buffer, TREE_OPERAND (node, 1), spc, flags, false);
+      pp_string (buffer, " > ");
+      break;
+

     default:
       NIY;
     }
 
   if (is_stmt && is_expr)
     pp_semicolon (buffer);
     default:
       NIY;
     }
 
   if (is_stmt && is_expr)
     pp_semicolon (buffer);

-  pp_write_text_to_stream (buffer);
+
+  /* If we're building a diagnostic, the formatted text will be written
+     into BUFFER's stream by the caller; otherwise, write it now.  */
+  if (!(flags & TDF_DIAGNOSTIC))
+    pp_write_text_to_stream (buffer);

 
   return spc;
 }
 
   return spc;
 }


@@ -2023,7 +2283,7 @@ print_declaration (pretty_printer *buffer, tree t, int spc, int flags)
    FIXME: Still incomplete.  */
 
 static void
    FIXME: Still incomplete.  */
 
 static void

-print_struct_decl (pretty_printer *buffer, tree node, int spc, int flags)
+print_struct_decl (pretty_printer *buffer, const_tree node, int spc, int flags)

 {
   /* Print the name of the structure.  */
   if (TYPE_NAME (node))
 {
   /* Print the name of the structure.  */
   if (TYPE_NAME (node))


@@ -2094,7 +2354,7 @@ print_struct_decl (pretty_printer *buffer, tree node, int spc, int flags)
    operators.  */
 
 static int
    operators.  */
 
 static int

-op_prio (tree op)
+op_prio (const_tree op)

 {
   if (op == NULL)
     return 9999;
 {
   if (op == NULL)
     return 9999;


@@ -2107,6 +2367,7 @@ op_prio (tree op)
       return 1;
 
     case MODIFY_EXPR:
       return 1;
 
     case MODIFY_EXPR:

+    case GIMPLE_MODIFY_STMT:

     case INIT_EXPR:
       return 2;
 
     case INIT_EXPR:
       return 2;
 


@@ -2157,9 +2418,12 @@ op_prio (tree op)
 
     case WIDEN_SUM_EXPR:
     case PLUS_EXPR:
 
     case WIDEN_SUM_EXPR:
     case PLUS_EXPR:

+    case POINTER_PLUS_EXPR:

     case MINUS_EXPR:
       return 12;
 
     case MINUS_EXPR:
       return 12;
 

+    case VEC_WIDEN_MULT_HI_EXPR:
+    case VEC_WIDEN_MULT_LO_EXPR:

     case WIDEN_MULT_EXPR:
     case DOT_PROD_EXPR:
     case MULT_EXPR:
     case WIDEN_MULT_EXPR:
     case DOT_PROD_EXPR:
     case MULT_EXPR:


@@ -2187,12 +2451,8 @@ op_prio (tree op)
     case INDIRECT_REF:
     case ADDR_EXPR:
     case FLOAT_EXPR:
     case INDIRECT_REF:
     case ADDR_EXPR:
     case FLOAT_EXPR:

-    case NOP_EXPR:
-    case CONVERT_EXPR:
+    CASE_CONVERT:

     case FIX_TRUNC_EXPR:
     case FIX_TRUNC_EXPR:

-    case FIX_CEIL_EXPR:
-    case FIX_FLOOR_EXPR:
-    case FIX_ROUND_EXPR:

     case TARGET_EXPR:
       return 14;
 
     case TARGET_EXPR:
       return 14;
 


@@ -2213,6 +2473,12 @@ op_prio (tree op)
     case REDUC_PLUS_EXPR:
     case VEC_LSHIFT_EXPR:
     case VEC_RSHIFT_EXPR:
     case REDUC_PLUS_EXPR:
     case VEC_LSHIFT_EXPR:
     case VEC_RSHIFT_EXPR:

+    case VEC_UNPACK_HI_EXPR:
+    case VEC_UNPACK_LO_EXPR:
+    case VEC_UNPACK_FLOAT_HI_EXPR:
+    case VEC_UNPACK_FLOAT_LO_EXPR:
+    case VEC_PACK_TRUNC_EXPR:
+    case VEC_PACK_SAT_EXPR:

       return 16;
 
     case SAVE_EXPR:
       return 16;
 
     case SAVE_EXPR:


@@ -2227,14 +2493,15 @@ op_prio (tree op)
 }
 
 
 }
 
 

-/* Return the symbol associated with operator OP.  */
+/* Return the symbol associated with operator CODE.  */

 
 

-static const char *
-op_symbol_1 (enum tree_code code)
+const char *
+op_symbol_code (enum tree_code code)

 {
   switch (code)
     {
     case MODIFY_EXPR:
 {
   switch (code)
     {
     case MODIFY_EXPR:

+    case GIMPLE_MODIFY_STMT:

       return "=";
 
     case TRUTH_OR_EXPR:
       return "=";
 
     case TRUTH_OR_EXPR:


@@ -2309,6 +2576,9 @@ op_symbol_1 (enum tree_code code)
 
     case VEC_RSHIFT_EXPR:
       return "v>>";
 
     case VEC_RSHIFT_EXPR:
       return "v>>";

+
+    case POINTER_PLUS_EXPR:
+      return "+";

  
     case PLUS_EXPR:
       return "+";
  
     case PLUS_EXPR:
       return "+";


@@ -2393,22 +2663,24 @@ op_symbol_1 (enum tree_code code)
     }
 }
 
     }
 }
 

+/* Return the symbol associated with operator OP.  */
+

 static const char *
 static const char *

-op_symbol (tree op)
+op_symbol (const_tree op)

 {
 {

-  return op_symbol_1 (TREE_CODE (op));
+  return op_symbol_code (TREE_CODE (op));

 }
 
 /* Prints the name of a CALL_EXPR.  */
 
 static void
 }
 
 /* Prints the name of a CALL_EXPR.  */
 
 static void

-print_call_name (pretty_printer *buffer, tree node)
+print_call_name (pretty_printer *buffer, const_tree node)

 {
   tree op0;
 
   gcc_assert (TREE_CODE (node) == CALL_EXPR);
 
 {
   tree op0;
 
   gcc_assert (TREE_CODE (node) == CALL_EXPR);
 

-  op0 = TREE_OPERAND (node, 0);
+  op0 = CALL_EXPR_FN (node);

 
   if (TREE_CODE (op0) == NON_LVALUE_EXPR)
     op0 = TREE_OPERAND (op0, 0);
 
   if (TREE_CODE (op0) == NON_LVALUE_EXPR)
     op0 = TREE_OPERAND (op0, 0);


@@ -2513,9 +2785,7 @@ pretty_print_string (pretty_printer *buffer, const char *str)
          pp_string (buffer, "\\'");
          break;
 
          pp_string (buffer, "\\'");
          break;
 

-       case '\0':
-         pp_string (buffer, "\\0");
-         break;
+         /* No need to handle \0; the loop terminates on \0.  */

 
        case '\1':
          pp_string (buffer, "\\1");
 
        case '\1':
          pp_string (buffer, "\\1");


@@ -2573,51 +2843,89 @@ newline_and_indent (pretty_printer *buffer, int spc)
   INDENT (spc);
 }
 
   INDENT (spc);
 }
 

+

 static void
 dump_vops (pretty_printer *buffer, tree stmt, int spc, int flags)
 {
 static void
 dump_vops (pretty_printer *buffer, tree stmt, int spc, int flags)
 {

-  tree use;
-  use_operand_p use_p;
-  def_operand_p def_p;
-  use_operand_p kill_p;
-  ssa_op_iter iter;
+  struct voptype_d *vdefs;
+  struct voptype_d *vuses;
+  int i, n;

 
 

-  if (!ssa_operands_active ())
+  if (!ssa_operands_active () || !stmt_references_memory_p (stmt))

     return;
 
     return;
 

-  FOR_EACH_SSA_MAYDEF_OPERAND (def_p, use_p, stmt, iter)
+  /* Even if the statement doesn't have virtual operators yet, it may
+     contain symbol information (this happens before aliases have been
+     computed).  */
+  if ((flags & TDF_MEMSYMS)
+      && VUSE_OPS (stmt) == NULL
+      && VDEF_OPS (stmt) == NULL)

     {
     {

-      pp_string (buffer, "#   ");
-      dump_generic_node (buffer, DEF_FROM_PTR (def_p),
-                         spc + 2, flags, false);
-      pp_string (buffer, " = V_MAY_DEF <");
-      dump_generic_node (buffer, USE_FROM_PTR (use_p),
-                         spc + 2, flags, false);
-      pp_string (buffer, ">;");
-      newline_and_indent (buffer, spc);
+      if (LOADED_SYMS (stmt))
+       {
+         pp_string (buffer, "# LOADS: ");
+         dump_symbols (buffer, LOADED_SYMS (stmt), flags);
+         newline_and_indent (buffer, spc);
+       }
+
+      if (STORED_SYMS (stmt))
+       {
+         pp_string (buffer, "# STORES: ");
+         dump_symbols (buffer, STORED_SYMS (stmt), flags);
+         newline_and_indent (buffer, spc);
+       }
+
+      return;

     }
 
     }
 

-  FOR_EACH_SSA_MUSTDEF_OPERAND (def_p, kill_p, stmt, iter)
+  vuses = VUSE_OPS (stmt);
+  while (vuses)

     {
     {

-      pp_string (buffer, "#   ");
-      dump_generic_node (buffer, DEF_FROM_PTR (def_p),
-                         spc + 2, flags, false);
-      pp_string (buffer, " = V_MUST_DEF <");
-      dump_generic_node (buffer, USE_FROM_PTR (kill_p),
-                         spc + 2, flags, false);
-      pp_string (buffer, ">;");
+      pp_string (buffer, "# VUSE <");
+
+      n = VUSE_NUM (vuses);
+      for (i = 0; i < n; i++)
+       {
+         dump_generic_node (buffer, VUSE_OP (vuses, i), spc + 2, flags, false);
+         if (i < n - 1)
+           pp_string (buffer, ", ");
+       }
+
+      pp_string (buffer, ">");
+
+      if (flags & TDF_MEMSYMS)
+       dump_symbols (buffer, LOADED_SYMS (stmt), flags);
+

       newline_and_indent (buffer, spc);
       newline_and_indent (buffer, spc);

+      vuses = vuses->next;

     }
 
     }
 

-  FOR_EACH_SSA_TREE_OPERAND (use, stmt, iter, SSA_OP_VUSE)
+  vdefs = VDEF_OPS (stmt);
+  while (vdefs)

     {
     {

-      pp_string (buffer, "#   VUSE <");
-      dump_generic_node (buffer, use, spc + 2, flags, false);
-      pp_string (buffer, ">;");
+      pp_string (buffer, "# ");
+      dump_generic_node (buffer, VDEF_RESULT (vdefs), spc + 2, flags, false);
+      pp_string (buffer, " = VDEF <");
+
+      n = VDEF_NUM (vdefs);
+      for (i = 0; i < n; i++)
+       {
+         dump_generic_node (buffer, VDEF_OP (vdefs, i), spc + 2, flags, 0);
+         if (i < n - 1)
+           pp_string (buffer, ", ");
+       }
+
+      pp_string (buffer, ">");
+
+      if ((flags & TDF_MEMSYMS) && vdefs->next == NULL)
+       dump_symbols (buffer, STORED_SYMS (stmt), flags);
+

       newline_and_indent (buffer, spc);
       newline_and_indent (buffer, spc);

+      vdefs = vdefs->next;

     }
 }
 
     }
 }
 

+

 /* Dumps basic block BB to FILE with details described by FLAGS and
    indented by INDENT spaces.  */
 
 /* Dumps basic block BB to FILE with details described by FLAGS and
    indented by INDENT spaces.  */
 


@@ -2726,8 +3034,8 @@ dump_bb_end (pretty_printer *buffer, basic_block bb, int indent, int flags)
   pp_newline (buffer);
 }
 
   pp_newline (buffer);
 }
 

-/* Dumps phi nodes of basic block BB to buffer BUFFER with details described by
-   FLAGS indented by INDENT spaces.  */
+/* Dump PHI nodes of basic block BB to BUFFER with details described
+   by FLAGS and indented by INDENT spaces.  */

 
 static void
 dump_phi_nodes (pretty_printer *buffer, basic_block bb, int indent, int flags)
 
 static void
 dump_phi_nodes (pretty_printer *buffer, basic_block bb, int indent, int flags)


@@ -2744,10 +3052,13 @@ dump_phi_nodes (pretty_printer *buffer, basic_block bb, int indent, int flags)
           pp_string (buffer, "# ");
           dump_generic_node (buffer, phi, indent, flags, false);
           pp_newline (buffer);
           pp_string (buffer, "# ");
           dump_generic_node (buffer, phi, indent, flags, false);
           pp_newline (buffer);

+         if (flags & TDF_VERBOSE)
+           print_node (buffer->buffer->stream, "", phi, indent);

         }
     }
 }
 
         }
     }
 }
 

+

 /* Dump jump to basic block BB that is represented implicitly in the cfg
    to BUFFER.  */
 
 /* Dump jump to basic block BB that is represented implicitly in the cfg
    to BUFFER.  */
 


@@ -2779,6 +3090,29 @@ dump_implicit_edges (pretty_printer *buffer, basic_block bb, int indent,
 {
   edge e;
   edge_iterator ei;
 {
   edge e;
   edge_iterator ei;

+  tree stmt;
+
+  stmt = last_stmt (bb);
+  if (stmt && TREE_CODE (stmt) == COND_EXPR)
+    {
+      edge true_edge, false_edge;
+
+      /* When we are emitting the code or changing CFG, it is possible that
+        the edges are not yet created.  When we are using debug_bb in such
+        a situation, we do not want it to crash.  */
+      if (EDGE_COUNT (bb->succs) != 2)
+       return;
+      extract_true_false_edges_from_block (bb, &true_edge, &false_edge);
+
+      INDENT (indent + 2);
+      pp_cfg_jump (buffer, true_edge->dest);
+      newline_and_indent (buffer, indent);
+      pp_string (buffer, "else");
+      newline_and_indent (buffer, indent + 2);
+      pp_cfg_jump (buffer, false_edge->dest);
+      pp_newline (buffer);
+      return;
+    }

 
   /* If there is a fallthru edge, we may need to add an artificial goto to the
      dump.  */
 
   /* If there is a fallthru edge, we may need to add an artificial goto to the
      dump.  */


@@ -2789,20 +3123,10 @@ dump_implicit_edges (pretty_printer *buffer, basic_block bb, int indent,
     {
       INDENT (indent);
 
     {
       INDENT (indent);
 

-      if ((flags & TDF_LINENO)
-#ifdef USE_MAPPED_LOCATION
-         && e->goto_locus != UNKNOWN_LOCATION
-#else
-         && e->goto_locus
-#endif
-         )
+      if ((flags & TDF_LINENO) && e->goto_locus != UNKNOWN_LOCATION)

        {
          expanded_location goto_xloc;
        {
          expanded_location goto_xloc;

-#ifdef USE_MAPPED_LOCATION

          goto_xloc = expand_location (e->goto_locus);
          goto_xloc = expand_location (e->goto_locus);

-#else
-         goto_xloc = *e->goto_locus;
-#endif

          pp_character (buffer, '[');
          if (goto_xloc.file)
            {
          pp_character (buffer, '[');
          if (goto_xloc.file)
            {


@@ -2847,6 +3171,9 @@ dump_generic_bb_buff (pretty_printer *buffer, basic_block bb,
       INDENT (curr_indent);
       dump_generic_node (buffer, stmt, curr_indent, flags, true);
       pp_newline (buffer);
       INDENT (curr_indent);
       dump_generic_node (buffer, stmt, curr_indent, flags, true);
       pp_newline (buffer);

+      dump_histograms_for_stmt (cfun, buffer->buffer->stream, stmt);
+      if (flags & TDF_VERBOSE)
+       print_node (buffer->buffer->stream, "", stmt, curr_indent);

     }
 
   dump_implicit_edges (buffer, bb, indent, flags);
     }
 
   dump_implicit_edges (buffer, bb, indent, flags);