diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Sema/SemaLookup.cpp | 7 | ||||
| -rw-r--r-- | clang/test/SemaTemplate/destructor-template.cpp | 10 |
2 files changed, 13 insertions, 4 deletions
diff --git a/clang/lib/Sema/SemaLookup.cpp b/clang/lib/Sema/SemaLookup.cpp index 44c9d276c3e..df817e6bcef 100644 --- a/clang/lib/Sema/SemaLookup.cpp +++ b/clang/lib/Sema/SemaLookup.cpp @@ -3112,11 +3112,10 @@ Sema::SpecialMemberOverloadResult Sema::LookupSpecialMember(CXXRecordDecl *RD, }); } CXXDestructorDecl *DD = RD->getDestructor(); - assert(DD && "record without a destructor"); Result->setMethod(DD); - Result->setKind(DD->isDeleted() ? - SpecialMemberOverloadResult::NoMemberOrDeleted : - SpecialMemberOverloadResult::Success); + Result->setKind(DD && !DD->isDeleted() + ? SpecialMemberOverloadResult::Success + : SpecialMemberOverloadResult::NoMemberOrDeleted); return *Result; } diff --git a/clang/test/SemaTemplate/destructor-template.cpp b/clang/test/SemaTemplate/destructor-template.cpp index 6570b645640..0d28ec816c6 100644 --- a/clang/test/SemaTemplate/destructor-template.cpp +++ b/clang/test/SemaTemplate/destructor-template.cpp @@ -92,3 +92,13 @@ class PR33189 template <class T> ~PR33189() { } // expected-error{{destructor cannot be declared as a template}} }; + +namespace PR38671 { +struct S { + template <class> + ~S(); // expected-error{{destructor cannot be declared as a template}} +}; +struct T : S { // expected-note{{destructor of 'T' is implicitly deleted because base class 'PR38671::S' has no destructor}} + ~T() = default; // expected-warning{{explicitly defaulted destructor is implicitly deleted}} +}; +} // namespace PR38671 |
