From b1a7e33d67c9a3d4e7d390d28ae2f178861421cc Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Fri, 16 Feb 2018 14:30:55 +0000 Subject: [PATCH] [PR c++/84375] Fix ICE after bad friend https://gcc.gnu.org/ml/gcc-patches/2018-02/msg00987.html PR c++/84375 * name-lookup.c (do_pushdecl): Bail out on bad local friend injection. * g++.dg/lookup/pr84375.C: New. From-SVN: r257739 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/name-lookup.c | 16 ++++++++++------ gcc/testsuite/ChangeLog | 7 ++++++- gcc/testsuite/g++.dg/lookup/pr84375.C | 9 +++++++++ 4 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 gcc/testsuite/g++.dg/lookup/pr84375.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ecd52d04b97..ee3ade9bd05 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2018-02-16 Nathan Sidwell + + PR c++/84375 + * name-lookup.c (do_pushdecl): Bail out on bad local friend injection. + 2018-02-15 Jason Merrill PR c++/83227 - C++17 ICE with init-list derived-to-base conversion. diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index e5a34003702..47cee30338d 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -3079,12 +3079,16 @@ do_pushdecl (tree decl, bool is_friend) if (is_friend) { if (level->kind != sk_namespace) - /* In a local class, a friend function declaration must - find a matching decl in the innermost non-class scope. - [class.friend/11] */ - error ("friend declaration %qD in local class without " - "prior local declaration", decl); - else if (!flag_friend_injection) + { + /* In a local class, a friend function declaration must + find a matching decl in the innermost non-class scope. + [class.friend/11] */ + error ("friend declaration %qD in local class without " + "prior local declaration", decl); + /* Don't attempt to push it. */ + return error_mark_node; + } + if (!flag_friend_injection) /* Hide it from ordinary lookup. */ DECL_ANTICIPATED (decl) = DECL_HIDDEN_FRIEND_P (decl) = true; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7cd64bb15ff..58eb38582d9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-02-16 Nathan Sidwell + + PR c++/84375 + * g++.dg/lookup/pr84375.C: New. + 2018-02-14 Oleg Endo PR target/83831 @@ -29,7 +34,7 @@ 2018-02-15 Martin Sebor * gcc.dg/lto/README (dg-lto-warning, dg-lto-message): Document new - directives. + directives. 2018-02-15 Janus Weil diff --git a/gcc/testsuite/g++.dg/lookup/pr84375.C b/gcc/testsuite/g++.dg/lookup/pr84375.C new file mode 100644 index 00000000000..24cdcb2c407 --- /dev/null +++ b/gcc/testsuite/g++.dg/lookup/pr84375.C @@ -0,0 +1,9 @@ +// PR c++/84375 ICE after error + +void foo() +{ + struct A + { + friend void A(); // { dg-error "local class without prior local" } + }; +} -- 2.30.2