merge from gcc

This commit is contained in:
DJ Delorie
2010-11-13 02:20:31 +00:00
parent df6008afc8
commit 361c311554
3 changed files with 14 additions and 8 deletions

View File

@@ -4546,20 +4546,17 @@ d_print_function_type (struct d_print_info *dpi,
struct d_print_mod *mods)
{
int need_paren;
int saw_mod;
int need_space;
struct d_print_mod *p;
struct d_print_mod *hold_modifiers;
need_paren = 0;
saw_mod = 0;
need_space = 0;
for (p = mods; p != NULL; p = p->next)
{
if (p->printed)
break;
saw_mod = 1;
switch (p->mod->type)
{
case DEMANGLE_COMPONENT_POINTER:
@@ -4588,9 +4585,6 @@ d_print_function_type (struct d_print_info *dpi,
break;
}
if (d_left (dc) != NULL && ! saw_mod)
need_paren = 1;
if (need_paren)
{
if (! need_space)