mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-10 12:21:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

c++: Pointer-to-member fn conversion with noexcept [PR99374]

Browse Source 
The issue in this PR is that we wrongly reject converting pointers to
member function of incomplete types, one of which has noexcept.  Recall
that pointers (including pointers to member functions) to non-throwing
functions can be implicitly converted to potentially-throwing functions
(but not vice versa).

We reject the conversion when called from can_convert_arg_bad because
standard_conversion can't create such a conversion.  It comes down to
the DERIVED_FROM_P check in the TYPE_PTRMEMFUNC_P block.  It considers
every class derived from itself, but not when the class is incomplete.
But surely we want to reach fnptr_conv_p when tbase is fbase (one of
them could be an alias to the other so use same_type_p instead of ==).

Another approach would be to not perform DERIVED_FROM_P at all when
either tbase or fbase are incomplete (so perhaps something like at the
end of ptr_reasonably_similar).

gcc/cp/ChangeLog:

	PR c++/99374
	* call.c (standard_conversion): When converting pointers to
	member, don't return NULL when the bases are equivalent but
	incomplete.

gcc/testsuite/ChangeLog:

	PR c++/99374
	* g++.dg/cpp1z/noexcept-type23.C: New test.
This commit is contained in:
Marek Polacek 2021-03-04 14:25:01 -05:00
parent c2e64c33d9
commit 02a3554879
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/cp/call.c
View File

@ -1449,7 +1449,9 @@ standard_conversion (tree to, tree from, tree expr, bool c_cast_p,
tree fbase = class_of_this_parm (fromfn);
tree tbase = class_of_this_parm (tofn);
if (!DERIVED_FROM_P (fbase, tbase))
/* If FBASE and TBASE are equivalent but incomplete, DERIVED_FROM_P
yields false. But a pointer to member of incomplete class is OK. */
if (!same_type_p (fbase, tbase) && !DERIVED_FROM_P (fbase, tbase))
return NULL;
tree fstat = static_fn_type (fromfn);

14
gcc/testsuite/g++.dg/cpp1z/noexcept-type23.C Normal file
View File

@ -0,0 +1,14 @@
// PR c++/99374
// { dg-do compile { target c++17 } }
struct S;
struct R;
using F1 = int (S::*)();
using F2 = int (S::*)() noexcept;
using F3 = int (R::*)() noexcept;
using T = S;
using F4 = int (T::*)() noexcept;
F1 f21 = F2();
F1 f41 = F4();
F2 f12 = F1(); // { dg-error "cannot convert" }
F1 f31 = F3(); // { dg-error "cannot convert" }