Author: Chuanqi Xu Date: 2022-10-31T21:17:03+08:00 New Revision: 22914a82299dc45d4e5a3ec6c50808c97e6e6a10
URL: https://github.com/llvm/llvm-project/commit/22914a82299dc45d4e5a3ec6c50808c97e6e6a10 DIFF: https://github.com/llvm/llvm-project/commit/22914a82299dc45d4e5a3ec6c50808c97e6e6a10.diff LOG: [NFC] Use isa<...> to replace isa<>||isa<> in clang/Serialization Now isa supports the variant args, which could simplify the codes further. This patch simplify the uses in clang/Serialization Added: Modified: clang/lib/Serialization/ASTCommon.cpp clang/lib/Serialization/ASTReader.cpp clang/lib/Serialization/ASTReaderDecl.cpp clang/lib/Serialization/ASTWriter.cpp clang/lib/Serialization/ASTWriterDecl.cpp Removed: ################################################################################ diff --git a/clang/lib/Serialization/ASTCommon.cpp b/clang/lib/Serialization/ASTCommon.cpp index 152037dfc9269..62ae1e74ece8b 100644 --- a/clang/lib/Serialization/ASTCommon.cpp +++ b/clang/lib/Serialization/ASTCommon.cpp @@ -474,7 +474,7 @@ bool serialization::needsAnonymousDeclarationNumber(const NamedDecl *D) { if (auto *VD = dyn_cast<VarDecl>(D)) return VD->isStaticLocal(); // FIXME: What about CapturedDecls (and declarations nested within them)? - return isa<TagDecl>(D) || isa<BlockDecl>(D); + return isa<TagDecl, BlockDecl>(D); } // Otherwise, we only care about anonymous class members / block-scope decls. @@ -484,5 +484,5 @@ bool serialization::needsAnonymousDeclarationNumber(const NamedDecl *D) { return false; if (!isa<RecordDecl, ObjCInterfaceDecl>(D->getLexicalDeclContext())) return false; - return isa<TagDecl>(D) || isa<FieldDecl>(D); + return isa<TagDecl, FieldDecl>(D); } diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp index d1132032c71fc..27ae748222553 100644 --- a/clang/lib/Serialization/ASTReader.cpp +++ b/clang/lib/Serialization/ASTReader.cpp @@ -7229,8 +7229,7 @@ void ASTReader::CompleteRedeclChain(const Decl *D) { // // FIXME: Merging a function definition should merge // all mergeable entities within it. - if (isa<TranslationUnitDecl>(DC) || isa<NamespaceDecl>(DC) || - isa<CXXRecordDecl>(DC) || isa<EnumDecl>(DC)) { + if (isa<TranslationUnitDecl, NamespaceDecl, CXXRecordDecl, EnumDecl>(DC)) { if (DeclarationName Name = cast<NamedDecl>(D)->getDeclName()) { if (!getContext().getLangOpts().CPlusPlus && isa<TranslationUnitDecl>(DC)) { diff --git a/clang/lib/Serialization/ASTReaderDecl.cpp b/clang/lib/Serialization/ASTReaderDecl.cpp index cabf06dcee7da..1fa8fa0f72e47 100644 --- a/clang/lib/Serialization/ASTReaderDecl.cpp +++ b/clang/lib/Serialization/ASTReaderDecl.cpp @@ -567,7 +567,7 @@ void ASTDeclReader::Visit(Decl *D) { void ASTDeclReader::VisitDecl(Decl *D) { if (D->isTemplateParameter() || D->isTemplateParameterPack() || - isa<ParmVarDecl>(D) || isa<ObjCTypeParamDecl>(D)) { + isa<ParmVarDecl, ObjCTypeParamDecl>(D)) { // We don't want to deserialize the DeclContext of a template // parameter or of a parameter of a function template immediately. These // entities might be used in the formulation of its DeclContext (for @@ -3021,16 +3021,11 @@ static bool isConsumerInterestedIn(ASTContext &Ctx, Decl *D, bool HasBody) { return false; } - if (isa<FileScopeAsmDecl>(D) || - isa<ObjCProtocolDecl>(D) || - isa<ObjCImplDecl>(D) || - isa<ImportDecl>(D) || - isa<PragmaCommentDecl>(D) || - isa<PragmaDetectMismatchDecl>(D)) + if (isa<FileScopeAsmDecl, ObjCProtocolDecl, ObjCImplDecl, ImportDecl, + PragmaCommentDecl, PragmaDetectMismatchDecl>(D)) return true; - if (isa<OMPThreadPrivateDecl>(D) || isa<OMPDeclareReductionDecl>(D) || - isa<OMPDeclareMapperDecl>(D) || isa<OMPAllocateDecl>(D) || - isa<OMPRequiresDecl>(D)) + if (isa<OMPThreadPrivateDecl, OMPDeclareReductionDecl, OMPDeclareMapperDecl, + OMPAllocateDecl, OMPRequiresDecl>(D)) return !D->getDeclContext()->isFunctionOrMethod(); if (const auto *Var = dyn_cast<VarDecl>(D)) return Var->isFileVarDecl() && @@ -4049,7 +4044,7 @@ void ASTReader::loadDeclUpdateRecords(PendingUpdateRecord &Record) { } // Add the lazy specializations to the template. assert((PendingLazySpecializationIDs.empty() || isa<ClassTemplateDecl>(D) || - isa<FunctionTemplateDecl>(D) || isa<VarTemplateDecl>(D)) && + isa<FunctionTemplateDecl, VarTemplateDecl>(D)) && "Must not have pending specializations"); if (auto *CTD = dyn_cast<ClassTemplateDecl>(D)) ASTDeclReader::AddLazySpecializations(CTD, PendingLazySpecializationIDs); diff --git a/clang/lib/Serialization/ASTWriter.cpp b/clang/lib/Serialization/ASTWriter.cpp index b70eb9526e19b..c2a586426a935 100644 --- a/clang/lib/Serialization/ASTWriter.cpp +++ b/clang/lib/Serialization/ASTWriter.cpp @@ -5471,7 +5471,7 @@ void ASTWriter::associateDeclWithFile(const Decl *D, DeclID ID) { // a function/objc method, should not have TU as lexical context. // TemplateTemplateParmDecls that are part of an alias template, should not // have TU as lexical context. - if (isa<ParmVarDecl>(D) || isa<TemplateTemplateParmDecl>(D)) + if (isa<ParmVarDecl, TemplateTemplateParmDecl>(D)) return; SourceManager &SM = Context->getSourceManager(); diff --git a/clang/lib/Serialization/ASTWriterDecl.cpp b/clang/lib/Serialization/ASTWriterDecl.cpp index 93785eeb9e880..e6c09cf5d7f4f 100644 --- a/clang/lib/Serialization/ASTWriterDecl.cpp +++ b/clang/lib/Serialization/ASTWriterDecl.cpp @@ -2417,7 +2417,7 @@ static bool isRequiredDecl(const Decl *D, ASTContext &Context, // File scoped assembly or obj-c or OMP declare target implementation must be // seen. - if (isa<FileScopeAsmDecl>(D) || isa<ObjCImplDecl>(D)) + if (isa<FileScopeAsmDecl, ObjCImplDecl>(D)) return true; if (WritingModule && isPartOfPerModuleInitializer(D)) { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
