diff options
Diffstat (limited to 'gcc/cp')
-rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
-rw-r--r-- | gcc/cp/name-lookup.c | 18 |
2 files changed, 25 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 770f817..6c07df1 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2016-05-27 Ville Voutilainen <ville.voutilainen@gmail.com> + + PR c++/69855 + * name-lookup.c (pushdecl_maybe_friend_1): Push local function + decls into the global scope after stripping template bits + and setting DECL_ANTICIPATED. + 2016-05-26 Jakub Jelinek <jakub@redhat.com> * semantics.c (finish_omp_clauses) <case OMP_CLAUSE_SCHEDULE>: Warn diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index eb128db..568c75e 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -929,6 +929,24 @@ pushdecl_maybe_friend_1 (tree x, bool is_friend) DECL_ANTICIPATED (t) = 1; DECL_HIDDEN_FRIEND_P (t) = 1; } + + if (TREE_CODE (x) == FUNCTION_DECL + && DECL_LOCAL_FUNCTION_P (x) + && !DECL_OMP_DECLARE_REDUCTION_P (x) + && !type_dependent_expression_p (x)) + { + /* PR c++/69855, a local function declaration + is stripped from template info and pushed to + the local scope as a hidden declaration. This + allows ill-formed overloads even in other scopes + to be diagnosed both at the local declaration site + and after it. */ + tree t2 = copy_decl (t); + DECL_USE_TEMPLATE (t2) = 0; + DECL_TEMPLATE_INFO (t2) = NULL_TREE; + DECL_ANTICIPATED (t2) = 1; + push_overloaded_decl (t2, PUSH_GLOBAL, is_friend); + } } if (t != x || DECL_FUNCTION_TEMPLATE_P (t)) |