Skip to content

Commit 79b0966

Browse files
committed
[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.
1 parent b78883f commit 79b0966

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

clang/include/clang/AST/DeclID.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,8 @@ class LocalDeclID : public DeclIDBase {
197197

198198
static LocalDeclID get(ASTReader &Reader, serialization::ModuleFile &MF,
199199
DeclID ID);
200+
static LocalDeclID get(ASTReader &Reader, serialization::ModuleFile &MF,
201+
unsigned ModuleFileIndex, unsigned LocalDeclID);
200202

201203
LocalDeclID &operator++() {
202204
++ID;

clang/lib/Serialization/ASTReader.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -935,9 +935,8 @@ LocalDeclID LocalDeclID::get(ASTReader &Reader, ModuleFile &MF, DeclID Value) {
935935
return ID;
936936
}
937937

938-
static LocalDeclID getLocalDeclID(ASTReader &Reader, ModuleFile &MF,
939-
unsigned ModuleFileIndex,
940-
unsigned LocalDeclID) {
938+
LocalDeclID LocalDeclID::get(ASTReader &Reader, ModuleFile &MF,
939+
unsigned ModuleFileIndex, unsigned LocalDeclID) {
941940
DeclID Value = (DeclID)ModuleFileIndex << 32 | (DeclID)LocalDeclID;
942941
return LocalDeclID::get(Reader, MF, Value);
943942
}
@@ -7884,7 +7883,7 @@ LocalDeclID ASTReader::mapGlobalIDToModuleFileGlobalID(ModuleFile &M,
78847883
if (!OrignalModuleFileIndex)
78857884
return LocalDeclID();
78867885

7887-
return getLocalDeclID(*this, M, OrignalModuleFileIndex, ID);
7886+
return LocalDeclID::get(*this, M, OrignalModuleFileIndex, ID);
78887887
}
78897888

78907889
GlobalDeclID ASTReader::ReadDeclID(ModuleFile &F, const RecordDataImpl &Record,

0 commit comments

Comments
 (0)