maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Collapse ASTReader::ReadSLocEntryRecord() into its only caller, 

ReadSLocEntry(). No functionality change.

llvm-svn: 166447
This commit is contained in:
Douglas Gregor 2012-10-22 22:53:10 +00:00
parent c9ad5fb604
commit 4750b77ea1
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clang/include/clang/Serialization/ASTReader.h
View File

@ -900,7 +900,6 @@ private:
bool CheckPredefinesBuffers();
bool ParseLineTable(ModuleFile &F, SmallVectorImpl<uint64_t> &Record);
bool ReadSourceManagerBlock(ModuleFile &F);
bool ReadSLocEntryRecord(int ID);
llvm::BitstreamCursor &SLocCursorForID(int ID);
SourceLocation getImportLocation(ModuleFile *F);
bool ReadSubmoduleBlock(ModuleFile &F);

11
clang/lib/Serialization/ASTReader.cpp
View File

@ -1079,8 +1079,7 @@ resolveFileRelativeToOriginalDir(const std::string &Filename,
return currPCHPath.str();
}
/// \brief Read in the source location entry with the given ID.
bool ASTReader::ReadSLocEntryRecord(int ID) {
bool ASTReader::ReadSLocEntry(int ID) {
if (ID == 0)
return false;
@ -2906,9 +2905,9 @@ ASTReader::ASTReadResult ASTReader::ReadAST(const std::string &FileName,
// Preload SLocEntries.
for (unsigned I = 0, N = F.PreloadSLocEntries.size(); I != N; ++I) {
int Index = int(F.PreloadSLocEntries[I] - 1) + F.SLocEntryBaseID;
// Load it through the SourceManager and don't call ReadSLocEntryRecord()
// Load it through the SourceManager and don't call ReadSLocEntry()
// directly because the entry may have already been loaded in which case
// calling ReadSLocEntryRecord() directly would trigger an assertion in
// calling ReadSLocEntry() directly would trigger an assertion in
// SourceManager.
SourceMgr.getLoadedSLocEntryByID(Index);
}
@ -6009,10 +6008,6 @@ MacroID ASTReader::getGlobalMacroID(ModuleFile &M, unsigned LocalID) {
return LocalID + I->second;
}
bool ASTReader::ReadSLocEntry(int ID) {
return ReadSLocEntryRecord(ID);
}
serialization::SubmoduleID
ASTReader::getGlobalSubmoduleID(ModuleFile &M, unsigned LocalID) {
if (LocalID < NUM_PREDEF_SUBMODULE_IDS)