diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst --- a/clang/docs/ReleaseNotes.rst +++ b/clang/docs/ReleaseNotes.rst @@ -89,6 +89,8 @@ - Fix a crash when attempting to default a virtual constexpr non-special member function in a derived class. This fixes `Issue 57431 `_ +- Fix a crash where we attempt to define a deleted destructor. This fixes + `Issue 57516 `_ Improvements to Clang's diagnostics diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -6954,8 +6954,8 @@ // Define defaulted constexpr virtual functions that override a base class // function right away. // FIXME: We can defer doing this until the vtable is marked as used. - if (CSM != CXXInvalid && M->isDefaulted() && M->isConstexpr() && - M->size_overridden_methods()) + if (CSM != CXXInvalid && !M->isDeleted() && M->isDefaulted() && + M->isConstexpr() && M->size_overridden_methods()) DefineDefaultedFunction(*this, M, M->getLocation()); if (!Incomplete) diff --git a/clang/test/SemaCXX/constant-expression-cxx2a.cpp b/clang/test/SemaCXX/constant-expression-cxx2a.cpp --- a/clang/test/SemaCXX/constant-expression-cxx2a.cpp +++ b/clang/test/SemaCXX/constant-expression-cxx2a.cpp @@ -1483,3 +1483,12 @@ virtual int constexpr f() = default; // expected-error {{only special member functions and comparison operators may be defaulted}} }; } + +namespace GH57516 { +class B{ + virtual constexpr ~B() = 0; // expected-note {{overridden virtual function is here}} +}; + +class D : B{}; // expected-error {{deleted function '~D' cannot override a non-deleted function}} +// expected-note@-1 {{destructor of 'D' is implicitly deleted because base class 'B' has an inaccessible destructor}} +}