https://github.com/ayokunle321 created https://github.com/llvm/llvm-project/pull/146426
Related: https://github.com/llvm/llvm-project/issues/123121 This patch refactors the `note_constexpr_invalid_cast `diagnostic to use enum_select instead of select. This gets rid of magic numbers in its caller and improves readability. >From b300c6cf32c771e03cec2d3172bacf461b524d0d Mon Sep 17 00:00:00 2001 From: Ayokunle Amodu <121697771+ayokunle...@users.noreply.github.com> Date: Mon, 30 Jun 2025 15:49:08 -0600 Subject: [PATCH] replace select with enum_select --- .../clang/Basic/DiagnosticCommentKinds.td | 4 +++- clang/lib/AST/CommentSema.cpp | 21 ++++++++++--------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/clang/include/clang/Basic/DiagnosticCommentKinds.td b/clang/include/clang/Basic/DiagnosticCommentKinds.td index 1122ace3027d8..6986f4a9ffbb0 100644 --- a/clang/include/clang/Basic/DiagnosticCommentKinds.td +++ b/clang/include/clang/Basic/DiagnosticCommentKinds.td @@ -77,7 +77,9 @@ def warn_doc_param_not_attached_to_a_function_decl : Warning< InGroup<Documentation>, DefaultIgnore; def warn_doc_function_method_decl_mismatch : Warning< - "'%select{\\|@}0%select{function|functiongroup|method|methodgroup|callback}1' " + "'%select{\\|@}0%enum_select<CallableKind>{" + "%Function{function}|%FunctionGroup{functiongroup}|" + "%Method{method}|%MethodGroup{methodgroup}|%Callback{callback}}1' " "command should be used in a comment attached to " "%select{a function|a function|an Objective-C method|an Objective-C method|" "a pointer to function}2 declaration">, diff --git a/clang/lib/AST/CommentSema.cpp b/clang/lib/AST/CommentSema.cpp index fb745fc560d2f..4706756973dc9 100644 --- a/clang/lib/AST/CommentSema.cpp +++ b/clang/lib/AST/CommentSema.cpp @@ -100,32 +100,33 @@ void Sema::checkFunctionDeclVerbatimLine(const BlockCommandComment *Comment) { if (!Info->IsFunctionDeclarationCommand) return; - unsigned DiagSelect; + std::optional<unsigned> DiagSelect; switch (Comment->getCommandID()) { case CommandTraits::KCI_function: - DiagSelect = (!isAnyFunctionDecl() && !isFunctionTemplateDecl())? 1 : 0; + if (!isAnyFunctionDecl() && !isFunctionTemplateDecl()) + DiagSelect = diag::CallableKind::Function; break; case CommandTraits::KCI_functiongroup: - DiagSelect = (!isAnyFunctionDecl() && !isFunctionTemplateDecl())? 2 : 0; + if (!isAnyFunctionDecl() && !isFunctionTemplateDecl()) + DiagSelect = diag::CallableKind::FunctionGroup; break; case CommandTraits::KCI_method: - DiagSelect = !isObjCMethodDecl() ? 3 : 0; + DiagSelect = diag::CallableKind::Method; break; case CommandTraits::KCI_methodgroup: - DiagSelect = !isObjCMethodDecl() ? 4 : 0; + DiagSelect = diag::CallableKind::MethodGroup; break; case CommandTraits::KCI_callback: - DiagSelect = !isFunctionPointerVarDecl() ? 5 : 0; + DiagSelect = diag::CallableKind::Callback; break; default: - DiagSelect = 0; + DiagSelect = std::nullopt; break; } if (DiagSelect) Diag(Comment->getLocation(), diag::warn_doc_function_method_decl_mismatch) - << Comment->getCommandMarker() - << (DiagSelect-1) << (DiagSelect-1) - << Comment->getSourceRange(); + << Comment->getCommandMarker() << (*DiagSelect) << (*DiagSelect) + << Comment->getSourceRange(); } void Sema::checkContainerDeclVerbatimLine(const BlockCommandComment *Comment) { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
