From 6db837a5288ee3ca5ec504fbd5a765817e556ac2 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Sun, 5 Apr 2020 20:31:56 -0400 Subject: [PATCH] c++: Fix ICE with lambda in operator function [PR93597] If we are going to use get_first_fn let's make sure we operate on is_overloaded_fn, as the rest of the codebase does, and if lookup finds any class-scope declaration, return early too. PR c++/93597 - ICE with lambda in operator function. * name-lookup.c (maybe_save_operator_binding): Check is_overloaded_fn. * g++.dg/cpp0x/lambda/lambda-93597.C: New test. --- gcc/cp/ChangeLog | 8 ++++++++ gcc/cp/name-lookup.c | 8 ++++---- gcc/testsuite/ChangeLog | 8 ++++++++ gcc/testsuite/g++.dg/cpp0x/lambda/lambda-93597.C | 8 ++++++++ 4 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/lambda/lambda-93597.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5c49b2c67e88..2e247069b962 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,11 @@ +2020-04-05 Marek Polacek + + 2020-02-06 Marek Polacek + Backport from mainline + + PR c++/93597 - ICE with lambda in operator function. + * name-lookup.c (maybe_save_operator_binding): Check is_overloaded_fn. + 2020-04-04 Jason Merrill PR c++/91377 diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index 8298ee171e0a..f5535ba50bc0 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -7627,10 +7627,10 @@ maybe_save_operator_binding (tree e) if (!fns && (fns = op_unqualified_lookup (fnname))) { - tree fn = get_first_fn (fns); - if (DECL_CLASS_SCOPE_P (fn)) - /* We don't need to remember class-scope functions, normal unqualified - lookup will find them again. */ + tree d = is_overloaded_fn (fns) ? get_first_fn (fns) : fns; + if (DECL_P (d) && DECL_CLASS_SCOPE_P (d)) + /* We don't need to remember class-scope functions or declarations, + normal unqualified lookup will find them again. */ return; bindings = tree_cons (fnname, fns, bindings); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a1101ae50b5d..ab5f3b167755 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2020-04-05 Marek Polacek + + 2020-02-06 Marek Polacek + Backport from mainline + + PR c++/93597 - ICE with lambda in operator function. + * g++.dg/cpp0x/lambda/lambda-93597.C: New test. + 2020-04-02 Martin Jambor PR tree-optimization/93435 diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-93597.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-93597.C new file mode 100644 index 000000000000..257d9c7cdfde --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-93597.C @@ -0,0 +1,8 @@ +// PR c++/93597 - ICE with lambda in operator function. +// { dg-do compile { target c++11 } } + +template +struct S { + using T ::operator<; + void operator==(T x) { [x] { 0 < x; }; } +}; -- 2.47.3