From 9c47bbb6e9bd8d95775a7887209d71f84d7e850c Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Fri, 2 Oct 2009 18:22:51 +0000 Subject: [PATCH] merge from gcc --- include/ChangeLog | 7 +++++++ include/demangle.h | 14 ++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/include/ChangeLog b/include/ChangeLog index 7e8f34505..8e3f70d5e 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,10 @@ +2009-09-29 Jason Merrill + + * demangle.h (enum demangle_component_type): Add + DEMANGLE_COMPONENT_LAMBDA, DEMANGLE_COMPONENT_DEFAULT_ARG, + DEMANGLE_COMPONENT_UNNAMED_TYPE. + (struct demangle_component): Add s_unary_num. + 2009-09-29 DJ Delorie * dis-asm.h: Add prototype for print_insn_rx. diff --git a/include/demangle.h b/include/demangle.h index 4b3565bfb..76fab0a45 100644 --- a/include/demangle.h +++ b/include/demangle.h @@ -381,6 +381,12 @@ enum demangle_component_type DEMANGLE_COMPONENT_GLOBAL_CONSTRUCTORS, /* Global destructors keyed to name. */ DEMANGLE_COMPONENT_GLOBAL_DESTRUCTORS, + /* A lambda closure type. */ + DEMANGLE_COMPONENT_LAMBDA, + /* A default argument scope. */ + DEMANGLE_COMPONENT_DEFAULT_ARG, + /* An unnamed type. */ + DEMANGLE_COMPONENT_UNNAMED_TYPE, /* A pack expansion. */ DEMANGLE_COMPONENT_PACK_EXPANSION }; @@ -494,6 +500,14 @@ struct demangle_component struct demangle_component *right; } s_binary; + struct + { + /* subtree, same place as d_left. */ + struct demangle_component *sub; + /* integer. */ + int num; + } s_unary_num; + } u; };