merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index 7bdb81c..2b3fa4a 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,12 @@
+2012-01-06  Jason Merrill  <jason@redhat.com>
+
+       PR c++/6057
+       PR c++/48051
+       PR c++/50855
+       PR c++/51322
+       * demangle.h (enum demangle_component_type): Add
+       DEMANGLE_COMPONENT_INITIALIZER_LIST, DEMANGLE_COMPONENT_NULLARY.
+
 2011-12-19  Chung-Lin Tang  <cltang@codesourcery.com>
 
        * elf/mips.h (elf_mips_reloc_type): Add R_MIPS16_TLS_* entries.

diff --git a/include/demangle.h b/include/demangle.h
index 98b11d7..34b3ed3 100644 (file)
--- a/include/demangle.h
+++ b/include/demangle.h
@@ -344,6 +344,9 @@ enum demangle_component_type
      template argument, and the right subtree is either NULL or
      another TEMPLATE_ARGLIST node.  */
   DEMANGLE_COMPONENT_TEMPLATE_ARGLIST,
+  /* An initializer list.  The left subtree is either an explicit type or
+     NULL, and the right subtree is a DEMANGLE_COMPONENT_ARGLIST.  */
+  DEMANGLE_COMPONENT_INITIALIZER_LIST,
   /* An operator.  This holds information about a standard
      operator.  */
   DEMANGLE_COMPONENT_OPERATOR,
@@ -353,6 +356,8 @@ enum demangle_component_type
   /* A typecast, represented as a unary operator.  The one subtree is
      the type to which the argument should be cast.  */
   DEMANGLE_COMPONENT_CAST,
+  /* A nullary expression.  The left subtree is the operator.  */
+  DEMANGLE_COMPONENT_NULLARY,
   /* A unary expression.  The left subtree is the operator, and the
      right subtree is the single argument.  */
   DEMANGLE_COMPONENT_UNARY,