Skip to content

Commit bfbbc19

Browse files
Allow struct q{int q;~q();} (#88597)
1 parent 9f43a41 commit bfbbc19

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

clang/include/clang/Basic/DiagnosticSemaKinds.td

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2187,8 +2187,6 @@ def err_undeclared_destructor_name : Error<
21872187
"undeclared identifier %0 in destructor name">;
21882188
def err_destructor_name : Error<
21892189
"expected the class name after '~' to name the enclosing class">;
2190-
def err_destructor_name_nontype : Error<
2191-
"identifier %0 after '~' in destructor name does not name a type">;
21922190
def err_destructor_expr_mismatch : Error<
21932191
"identifier %0 in object destruction expression does not name the type "
21942192
"%1 of the object being destroyed">;

clang/lib/Sema/SemaExprCXX.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -448,9 +448,8 @@ ParsedType Sema::getDestructorName(const IdentifierInfo &II,
448448
Diag(NameLoc, diag::err_destructor_expr_nontype)
449449
<< &II << MakeFixItHint();
450450
}
451-
} else {
452-
Diag(NameLoc, SearchType.isNull() ? diag::err_destructor_name_nontype
453-
: diag::err_destructor_expr_mismatch)
451+
} else if (!SearchType.isNull()) {
452+
Diag(NameLoc, diag::err_destructor_expr_mismatch)
454453
<< &II << SearchType << MakeFixItHint();
455454
}
456455

0 commit comments

Comments
 (0)