diff options
| author | Ville Voutilainen <ville@gcc.gnu.org> | 2016-05-28 11:22:15 +0300 |
|---|---|---|
| committer | Ville Voutilainen <ville@gcc.gnu.org> | 2016-05-28 11:22:15 +0300 |
| commit | cdfa2b24d2496f304c65bf48a6bc4f66bbc2e698 (patch) | |
| tree | 2f388984bf65046a29d0ad233d65a85e6403373f /gcc/cp | |
| parent | f3c82ff9a9f831481d45a370476743d73f6704a3 (diff) | |
| download | gcc-cdfa2b24d2496f304c65bf48a6bc4f66bbc2e698.zip gcc-cdfa2b24d2496f304c65bf48a6bc4f66bbc2e698.tar.gz gcc-cdfa2b24d2496f304c65bf48a6bc4f66bbc2e698.tar.bz2 | |
Revert the attempted fix for c++/69855, it breaks bootstrap.
From-SVN: r236844
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/name-lookup.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index 1173370..cbd5209 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -929,24 +929,6 @@ 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)) |