diff options
| author | Simon Martin <simon@nasilyan.com> | 2024-06-02 17:45:04 +0200 |
|---|---|---|
| committer | Simon Martin <simon@nasilyan.com> | 2024-06-02 17:49:48 +0200 |
| commit | 47827293551a3ec339617678c8e938c8ca3790f1 (patch) | |
| tree | a2e892ef07b9ea22c967313c495e1d6986ed01a4 | |
| parent | 80c1a963bdfb573feb398ef02269671a5d690c1f (diff) | |
| download | gcc-47827293551a3ec339617678c8e938c8ca3790f1.zip gcc-47827293551a3ec339617678c8e938c8ca3790f1.tar.gz gcc-47827293551a3ec339617678c8e938c8ca3790f1.tar.bz2 | |
Fix PR c++/109958: ICE taking the address of bound static member function brought into derived class by using-declaration
We currently ICE upon the following because we don't properly handle the
overload created for B::f through the using statement.
=== cut here ===
struct B { static int f(); };
struct D : B { using B::f; };
void f(D d) { &d.f; }
=== cut here ===
This patch makes build_class_member_access_expr and cp_build_addr_expr_1 handle
such overloads, and fixes the PR.
Successfully tested on x86_64-pc-linux-gnu.
PR c++/109958
gcc/cp/ChangeLog:
* typeck.cc (build_class_member_access_expr): Handle single OVERLOADs.
(cp_build_addr_expr_1): Likewise.
gcc/testsuite/ChangeLog:
* g++.dg/overload/using6.C: New test.
| -rw-r--r-- | gcc/cp/typeck.cc | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/overload/using6.C | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/gcc/cp/typeck.cc b/gcc/cp/typeck.cc index 1b7a31d..5970ac3 100644 --- a/gcc/cp/typeck.cc +++ b/gcc/cp/typeck.cc @@ -3025,6 +3025,8 @@ build_class_member_access_expr (cp_expr object, tree member, know the type of the expression. Otherwise, we must wait until overload resolution has been performed. */ functions = BASELINK_FUNCTIONS (member); + if (TREE_CODE (functions) == OVERLOAD && OVL_SINGLE_P (functions)) + functions = OVL_FIRST (functions); if (TREE_CODE (functions) == FUNCTION_DECL && DECL_STATIC_FUNCTION_P (functions)) type = TREE_TYPE (functions); @@ -7333,6 +7335,9 @@ cp_build_addr_expr_1 (tree arg, bool strict_lvalue, tsubst_flags_t complain) { tree fn = BASELINK_FUNCTIONS (TREE_OPERAND (arg, 1)); + if (TREE_CODE (fn) == OVERLOAD && OVL_SINGLE_P (fn)) + fn = OVL_FIRST (fn); + /* We can only get here with a single static member function. */ gcc_assert (TREE_CODE (fn) == FUNCTION_DECL diff --git a/gcc/testsuite/g++.dg/overload/using6.C b/gcc/testsuite/g++.dg/overload/using6.C new file mode 100644 index 0000000..4f89f68 --- /dev/null +++ b/gcc/testsuite/g++.dg/overload/using6.C @@ -0,0 +1,5 @@ +// PR c++/109958 + +struct B { static int f(); }; +struct D : B { using B::f; }; +void f(D d) { &d.f; } |