Author: Weverything Date: 2020-06-19T18:39:30-07:00 New Revision: d5f9c4a3d10d166af1f445d20510705117eb6fea
URL: https://github.com/llvm/llvm-project/commit/d5f9c4a3d10d166af1f445d20510705117eb6fea DIFF: https://github.com/llvm/llvm-project/commit/d5f9c4a3d10d166af1f445d20510705117eb6fea.diff LOG: [ODRHash] Remove use of 'whitelist'. Added: Modified: clang/include/clang/AST/ODRHash.h clang/lib/AST/ODRHash.cpp clang/lib/Serialization/ASTReader.cpp Removed: ################################################################################ diff --git a/clang/include/clang/AST/ODRHash.h b/clang/include/clang/AST/ODRHash.h index cd4a6f37f5db..2e8593e0b835 100644 --- a/clang/include/clang/AST/ODRHash.h +++ b/clang/include/clang/AST/ODRHash.h @@ -89,7 +89,7 @@ class ODRHash { // Save booleans until the end to lower the size of data to process. void AddBoolean(bool value); - static bool isWhitelistedDecl(const Decl* D, const DeclContext *Parent); + static bool isDeclToBeProcessed(const Decl* D, const DeclContext *Parent); private: void AddDeclarationNameImpl(DeclarationName Name); diff --git a/clang/lib/AST/ODRHash.cpp b/clang/lib/AST/ODRHash.cpp index 1f9ff9e407dc..735bcff8f113 100644 --- a/clang/lib/AST/ODRHash.cpp +++ b/clang/lib/AST/ODRHash.cpp @@ -440,7 +440,7 @@ class ODRDeclVisitor : public ConstDeclVisitor<ODRDeclVisitor> { // Only allow a small portion of Decl's to be processed. Remove this once // all Decl's can be handled. -bool ODRHash::isWhitelistedDecl(const Decl *D, const DeclContext *Parent) { +bool ODRHash::isDeclToBeProcessed(const Decl *D, const DeclContext *Parent) { if (D->isImplicit()) return false; if (D->getDeclContext() != Parent) return false; @@ -487,7 +487,7 @@ void ODRHash::AddCXXRecordDecl(const CXXRecordDecl *Record) { // accurate count of Decl's. llvm::SmallVector<const Decl *, 16> Decls; for (Decl *SubDecl : Record->decls()) { - if (isWhitelistedDecl(SubDecl, Record)) { + if (isDeclToBeProcessed(SubDecl, Record)) { Decls.push_back(SubDecl); if (auto *Function = dyn_cast<FunctionDecl>(SubDecl)) { // Compute/Preload ODRHash into FunctionDecl. @@ -588,7 +588,7 @@ void ODRHash::AddFunctionDecl(const FunctionDecl *Function, // accurate count of Decl's. llvm::SmallVector<const Decl *, 16> Decls; for (Decl *SubDecl : Function->decls()) { - if (isWhitelistedDecl(SubDecl, Function)) { + if (isDeclToBeProcessed(SubDecl, Function)) { Decls.push_back(SubDecl); } } @@ -614,7 +614,7 @@ void ODRHash::AddEnumDecl(const EnumDecl *Enum) { // accurate count of Decl's. llvm::SmallVector<const Decl *, 16> Decls; for (Decl *SubDecl : Enum->decls()) { - if (isWhitelistedDecl(SubDecl, Enum)) { + if (isDeclToBeProcessed(SubDecl, Enum)) { assert(isa<EnumConstantDecl>(SubDecl) && "Unexpected Decl"); Decls.push_back(SubDecl); } diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp index 3a8ac5abc60a..4dd2054d4b07 100644 --- a/clang/lib/Serialization/ASTReader.cpp +++ b/clang/lib/Serialization/ASTReader.cpp @@ -9581,7 +9581,7 @@ void ASTReader::diagnoseOdrViolations() { // Used with err_module_odr_violation_mismatch_decl and // note_module_odr_violation_mismatch_decl - // This list should be the same Decl's as in ODRHash::isWhiteListedDecl + // This list should be the same Decl's as in ODRHash::isDeclToBeProcessed enum ODRMismatchDecl { EndOfClass, PublicSpecifer, @@ -9924,7 +9924,7 @@ void ASTReader::diagnoseOdrViolations() { RecordDecl *Record, const DeclContext *DC) { for (auto *D : Record->decls()) { - if (!ODRHash::isWhitelistedDecl(D, DC)) + if (!ODRHash::isDeclToBeProcessed(D, DC)) continue; Hashes.emplace_back(D, ComputeSubDeclODRHash(D)); } @@ -11410,7 +11410,7 @@ void ASTReader::diagnoseOdrViolations() { for (auto *D : Enum->decls()) { // Due to decl merging, the first EnumDecl is the parent of // Decls in both records. - if (!ODRHash::isWhitelistedDecl(D, FirstEnum)) + if (!ODRHash::isDeclToBeProcessed(D, FirstEnum)) continue; assert(isa<EnumConstantDecl>(D) && "Unexpected Decl kind"); Hashes.emplace_back(cast<EnumConstantDecl>(D), _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
