procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

name-lookup.c (pushdecl_outermost_localscope): Always conditionally stop timer.

Browse source 
* name-lookup.c (pushdecl_outermost_localscope): Always
	conditionally stop timer.

From-SVN: r247910
This commit is contained in:
Nathan Sidwell 2017-05-11 14:51:07 +00:00 • committed by Nathan Sidwell
parent c443f3d51e
commit c8634a1a24
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gcc/cp/ChangeLog
View file

@ -1,5 +1,8 @@
2017-05-11 Nathan Sidwell <nathan@acm.org>
* name-lookup.c (pushdecl_outermost_localscope): Always
conditionally stop timer.
* decl.c (xref_tag_1): Don't frob ts_lambda scope here.
* name-lookup.c (pushtag_1): Deal with ts_lambda scope.

18
gcc/cp/name-lookup.c
View file

@ -2874,19 +2874,17 @@ pushdecl_with_scope_1 (tree x, cp_binding_level *level, bool is_friend)
tree
pushdecl_outermost_localscope (tree x)
{
cp_binding_level *b = NULL;
bool subtime = timevar_cond_start (TV_NAME_LOOKUP);
cp_binding_level *b = NULL, *n = current_binding_level;
if (n->kind == sk_function_parms)
return error_mark_node;
do
{
b = n;
n = b->level_chain;
}
while (n->kind != sk_function_parms);
tree ret = pushdecl_with_scope_1 (x, b, false);
/* Find the scope just inside the function parms. */
for (cp_binding_level *n = current_binding_level;
n->kind != sk_function_parms; n = b->level_chain)
b = n;
tree ret = b ? pushdecl_with_scope_1 (x, b, false) : error_mark_node;
timevar_cond_stop (TV_NAME_LOOKUP, subtime);
return ret;
}