aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorPatrick Palka <ppalka@redhat.com>2023-02-03 09:15:29 -0500
committerPatrick Palka <ppalka@redhat.com>2023-02-03 09:15:29 -0500
commited2b519e02eac99fadfa51adc7b11f8854c24575 (patch)
treece8bb184a383d8d5b228d7c220ba95b3875223aa /gcc/cp
parente7930c6750d03b28d922ebbbace20ba9d8622c6a (diff)
downloadgcc-ed2b519e02eac99fadfa51adc7b11f8854c24575.zip
gcc-ed2b519e02eac99fadfa51adc7b11f8854c24575.tar.gz
gcc-ed2b519e02eac99fadfa51adc7b11f8854c24575.tar.bz2
c++: ICE on unviable/ambiguous constrained dtors [PR96745]
Here we're crashing from check_bases_and_members due to CLASSTYPE_DESTRUCTOR being an OVERLOAD which, due to the pruning performed by add_method, should only happen if there is no viable destructor or the destructor is ambiguous because of unsatisfied or ambiguous constraints. This patch fixes this by making check_bases_and_members naturally handle CLASSTYPE_DESTRUCTOR being an OVERLOAD. It's then convenient to prune the OVERLOAD after effectively diagnosing the overload resolution failure in check_methods. PR c++/96745 gcc/cp/ChangeLog: * class.cc (check_methods): Diagnose an unviable OVERLOAD set for CLASSTYPE_DESTRUCTOR differently from an ambiguous one. Then prune the OVERLOAD to a single function. (check_bases_and_members): Handle CLASSTYPE_DESTRUCTOR being an OVERLOAD when calling deduce_noexcept_on_destructor. Document why it has to be called before check_methods. gcc/testsuite/ChangeLog: * g++.dg/cpp2a/concepts-dtor1.C: New test.
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/class.cc22
1 files changed, 19 insertions, 3 deletions
diff --git a/gcc/cp/class.cc b/gcc/cp/class.cc
index 40e6b73..27a7982 100644
--- a/gcc/cp/class.cc
+++ b/gcc/cp/class.cc
@@ -4808,9 +4808,23 @@ check_methods (tree t)
in that class with an empty argument list to select the destructor
for the class, also known as the selected destructor. The program
is ill-formed if overload resolution fails. */
+ int viable = 0;
+ for (tree fn : ovl_range (dtor))
+ if (constraints_satisfied_p (fn))
+ ++viable;
+ gcc_checking_assert (viable != 1);
+
auto_diagnostic_group d;
- error_at (location_of (t), "destructor for %qT is ambiguous", t);
+ if (viable == 0)
+ error_at (location_of (t), "no viable destructor for %qT", t);
+ else
+ error_at (location_of (t), "destructor for %qT is ambiguous", t);
print_candidates (dtor);
+
+ /* Arbitrarily prune the overload set to a single function for
+ sake of error recovery. */
+ tree *slot = find_member_slot (t, dtor_identifier);
+ *slot = get_first_fn (dtor);
}
else if (user_provided_p (dtor))
TYPE_HAS_NONTRIVIAL_DESTRUCTOR (t) = true;
@@ -6048,10 +6062,12 @@ check_bases_and_members (tree t)
check_bases (t, &cant_have_const_ctor, &no_const_asn_ref);
/* Deduce noexcept on destructor. This needs to happen after we've set
- triviality flags appropriately for our bases. */
+ triviality flags appropriately for our bases, and before checking
+ overriden virtual functions via check_methods. */
if (cxx_dialect >= cxx11)
if (tree dtor = CLASSTYPE_DESTRUCTOR (t))
- deduce_noexcept_on_destructor (dtor);
+ for (tree fn : ovl_range (dtor))
+ deduce_noexcept_on_destructor (fn);
/* Check all the method declarations. */
check_methods (t);