Author: Chuanqi Xu Date: 2024-06-24T14:10:52+08:00 New Revision: 79b0966f2f137869cabab42d094fc1ccbb58373c
URL: https://github.com/llvm/llvm-project/commit/79b0966f2f137869cabab42d094fc1ccbb58373c DIFF: https://github.com/llvm/llvm-project/commit/79b0966f2f137869cabab42d094fc1ccbb58373c.diff LOG: [NFC] [Serialization] Refactor getLocalDeclID to 'LocalDeclID::get' I just realized that the name `getLocalDeclID` looks like an member function in ASTReader. It looks not good. So I decided to refactor this into a static member function in LocalDeclID. Added: Modified: clang/include/clang/AST/DeclID.h clang/lib/Serialization/ASTReader.cpp Removed: ################################################################################ diff --git a/clang/include/clang/AST/DeclID.h b/clang/include/clang/AST/DeclID.h index 65d8108470e7b..e5e27389fac60 100644 --- a/clang/include/clang/AST/DeclID.h +++ b/clang/include/clang/AST/DeclID.h @@ -197,6 +197,8 @@ class LocalDeclID : public DeclIDBase { static LocalDeclID get(ASTReader &Reader, serialization::ModuleFile &MF, DeclID ID); + static LocalDeclID get(ASTReader &Reader, serialization::ModuleFile &MF, + unsigned ModuleFileIndex, unsigned LocalDeclID); LocalDeclID &operator++() { ++ID; diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp index e8b398615e0e1..079ac3f0e3545 100644 --- a/clang/lib/Serialization/ASTReader.cpp +++ b/clang/lib/Serialization/ASTReader.cpp @@ -935,9 +935,8 @@ LocalDeclID LocalDeclID::get(ASTReader &Reader, ModuleFile &MF, DeclID Value) { return ID; } -static LocalDeclID getLocalDeclID(ASTReader &Reader, ModuleFile &MF, - unsigned ModuleFileIndex, - unsigned LocalDeclID) { +LocalDeclID LocalDeclID::get(ASTReader &Reader, ModuleFile &MF, + unsigned ModuleFileIndex, unsigned LocalDeclID) { DeclID Value = (DeclID)ModuleFileIndex << 32 | (DeclID)LocalDeclID; return LocalDeclID::get(Reader, MF, Value); } @@ -7884,7 +7883,7 @@ LocalDeclID ASTReader::mapGlobalIDToModuleFileGlobalID(ModuleFile &M, if (!OrignalModuleFileIndex) return LocalDeclID(); - return getLocalDeclID(*this, M, OrignalModuleFileIndex, ID); + return LocalDeclID::get(*this, M, OrignalModuleFileIndex, ID); } GlobalDeclID ASTReader::ReadDeclID(ModuleFile &F, const RecordDataImpl &Record, _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
