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

[PR c++/84733] ICE in check-local-shadow

Browse source 
https://gcc.gnu.org/ml/gcc-patches/2018-03/msg00425.html
	PR c++/84733
	* name-lookup.c (do_pushdecl_with_scope): Only clear
	current_function_decl when pushing a non-class (i.e. namespace)
	scope.

From-SVN: r258383
This commit is contained in:
Nathan Sidwell 2018-03-09 12:13:55 +00:00 • committed by Nathan Sidwell
parent 77a5c1b62d
commit d04e6ed5ae
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gcc/cp/ChangeLog
View file

@ -1,3 +1,10 @@
2018-03-09 Nathan Sidwell <nathan@acm.org>
PR c++/84733
* name-lookup.c (do_pushdecl_with_scope): Only clear
current_function_decl when pushing a non-class (i.e. namespace)
scope.
2018-03-08 Jason Merrill <jason@redhat.com>
Jakub Jelinek <jakub@redhat.com>

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

@ -3965,9 +3965,7 @@ static tree
do_pushdecl_with_scope (tree x, cp_binding_level *level, bool is_friend)
{
cp_binding_level *b;
tree function_decl = current_function_decl;
current_function_decl = NULL_TREE;
if (level->kind == sk_class)
{
b = class_binding_level;
@ -3977,12 +3975,15 @@ do_pushdecl_with_scope (tree x, cp_binding_level *level, bool is_friend)
}
else
{
tree function_decl = current_function_decl;
if (level->kind == sk_namespace)
current_function_decl = NULL_TREE;
b = current_binding_level;
current_binding_level = level;
x = pushdecl (x, is_friend);
current_binding_level = b;
current_function_decl = function_decl;
}
current_function_decl = function_decl;
return x;
}