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

re PR c++/39055 ([DR 1443][4.4/4.5/4.6/4.7 regression] questionable default parameter of a member function accepted)

Browse source 
PR c++/39055
	* decl.c (local_variable_p_walkfn): Don't check DECL_ARTIFICIAL.

From-SVN: r184199
This commit is contained in:
Jason Merrill 2012-02-14 03:39:51 -05:00 • committed by Jason Merrill
parent d4a698d494
commit f0ebe02d7f
4 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gcc/cp/ChangeLog
View file

@ -1,3 +1,8 @@
2012-02-14 Jason Merrill <jason@redhat.com>
PR c++/39055
* decl.c (local_variable_p_walkfn): Don't check DECL_ARTIFICIAL.
2012-02-14 Jakub Jelinek <jakub@redhat.com>
PR c/52181

10
gcc/cp/decl.c
View file

@ -10509,7 +10509,9 @@ static tree
local_variable_p_walkfn (tree *tp, int *walk_subtrees,
void *data ATTRIBUTE_UNUSED)
{
if (local_variable_p (*tp) && !DECL_ARTIFICIAL (*tp))
/* Check DECL_NAME to avoid including temporaries. We don't check
DECL_ARTIFICIAL because we do want to complain about 'this'. */
if (local_variable_p (*tp) && DECL_NAME (*tp))
return *tp;
else if (TYPE_P (*tp))
*walk_subtrees = 0;
@ -10517,7 +10519,6 @@ local_variable_p_walkfn (tree *tp, int *walk_subtrees,
return NULL_TREE;
}
/* Check that ARG, which is a default-argument expression for a
parameter DECL, is valid. Returns ARG, or ERROR_MARK_NODE, if
something goes wrong. DECL may also be a _TYPE node, rather than a
@ -10578,7 +10579,10 @@ check_default_argument (tree decl, tree arg)
var = cp_walk_tree_without_duplicates (&arg, local_variable_p_walkfn, NULL);
if (var)
{
error ("default argument %qE uses local variable %qD", arg, var);
if (DECL_NAME (var) == this_identifier)
permerror (input_location, "default argument %qE uses %qD", arg, var);
else
error ("default argument %qE uses local variable %qD", arg, var);
return error_mark_node;
}

5
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
2012-02-14 Jason Merrill <jason@redhat.com>
PR c++/39055
* g++.dg/overload/defarg5.C: New.
2012-02-14 Jakub Jelinek <jakub@redhat.com>
PR c/52181

7
gcc/testsuite/g++.dg/overload/defarg5.C Normal file
View file

@ -0,0 +1,7 @@
// PR c++/39055
struct A
{
int i;
A() { void foo(int=i); } // { dg-error "this" }
};