Commit 52a764ac by H.J. Lu Committed by H.J. Lu

re PR c++/37450 (C++ FE times out on duplicated parameter)

2008-09-17  H.J. Lu  <hongjiu.lu@intel.com>

	PR c++/37450
	* name-lookup.c (pushdecl_maybe_friend): Don't return the old
	parameter for duplicate.

From-SVN: r140425
parent 118dde55
2008-09-17 H.J. Lu <hongjiu.lu@intel.com>
PR c++/37450
* name-lookup.c (pushdecl_maybe_friend): Don't return the old
parameter for duplicate.
2008-09-17 Jason Merrill <jason@redhat.com> 2008-09-17 Jason Merrill <jason@redhat.com>
PR c++/37588 PR c++/37588
......
...@@ -720,8 +720,9 @@ pushdecl_maybe_friend (tree x, bool is_friend) ...@@ -720,8 +720,9 @@ pushdecl_maybe_friend (tree x, bool is_friend)
else if (TREE_CODE (t) == PARM_DECL) else if (TREE_CODE (t) == PARM_DECL)
{ {
/* Check for duplicate params. */ /* Check for duplicate params. */
if (duplicate_decls (x, t, is_friend)) tree d = duplicate_decls (x, t, is_friend);
POP_TIMEVAR_AND_RETURN (TV_NAME_LOOKUP, t); if (d)
POP_TIMEVAR_AND_RETURN (TV_NAME_LOOKUP, d);
} }
else if ((DECL_EXTERN_C_FUNCTION_P (x) else if ((DECL_EXTERN_C_FUNCTION_P (x)
|| DECL_FUNCTION_TEMPLATE_P (x)) || DECL_FUNCTION_TEMPLATE_P (x))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment