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

Refactor ASTReader::readInputFileInfo to return a struct containing the related information. 

No functionality change.

llvm-svn: 203881
This commit is contained in:
Argyrios Kyrtzidis 2014-03-14 02:26:27 +00:00
parent 1b6a6f16fa
commit ce9b49e5ec
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1022,10 +1022,15 @@ private:
/// \brief Reads a statement from the specified cursor.
Stmt *ReadStmtFromStream(ModuleFile &F);
struct InputFileInfo {
std::string Filename;
off_t StoredSize;
time_t StoredTime;
bool Overridden;
};
/// \brief Reads the stored information about an input file.
void readInputFileInfo(ModuleFile &F, unsigned ID, std::string &Filename,
off_t &StoredSize, time_t &StoredTime,
bool &Overridden);
InputFileInfo readInputFileInfo(ModuleFile &F, unsigned ID);
/// \brief A convenience method to read the filename from an input file.
std::string getInputFileName(ModuleFile &F, unsigned ID);

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

@ -1870,9 +1870,8 @@ void ASTReader::installImportedMacro(IdentifierInfo *II, ModuleMacroInfo *MMI,
PP.appendMacroDirective(II, MD);
}
void ASTReader::readInputFileInfo(ModuleFile &F, unsigned ID,
std::string &Filename, off_t &StoredSize,
time_t &StoredTime, bool &Overridden) {
ASTReader::InputFileInfo
ASTReader::readInputFileInfo(ModuleFile &F, unsigned ID) {
// Go find this input file.
BitstreamCursor &Cursor = F.InputFilesCursor;
SavedStreamPosition SavedPosition(Cursor);
@ -1887,21 +1886,23 @@ void ASTReader::readInputFileInfo(ModuleFile &F, unsigned ID,
"invalid record type for input file");
(void)Result;
std::string Filename;
off_t StoredSize;
time_t StoredTime;
bool Overridden;
assert(Record[0] == ID && "Bogus stored ID or offset");
StoredSize = static_cast<off_t>(Record[1]);
StoredTime = static_cast<time_t>(Record[2]);
Overridden = static_cast<bool>(Record[3]);
Filename = Blob;
MaybeAddSystemRootToFilename(F, Filename);
return { std::move(Filename), StoredSize, StoredTime, Overridden };
}
std::string ASTReader::getInputFileName(ModuleFile &F, unsigned int ID) {
off_t StoredSize;
time_t StoredTime;
bool Overridden;
std::string Filename;
readInputFileInfo(F, ID, Filename, StoredSize, StoredTime, Overridden);
return Filename;
return readInputFileInfo(F, ID).Filename;
}
InputFile ASTReader::getInputFile(ModuleFile &F, unsigned ID, bool Complain) {
@ -1921,11 +1922,11 @@ InputFile ASTReader::getInputFile(ModuleFile &F, unsigned ID, bool Complain) {
SavedStreamPosition SavedPosition(Cursor);
Cursor.JumpToBit(F.InputFileOffsets[ID-1]);
off_t StoredSize;
time_t StoredTime;
bool Overridden;
std::string Filename;
readInputFileInfo(F, ID, Filename, StoredSize, StoredTime, Overridden);
InputFileInfo FI = readInputFileInfo(F, ID);
off_t StoredSize = FI.StoredSize;
time_t StoredTime = FI.StoredTime;
bool Overridden = FI.Overridden;
StringRef Filename = FI.Filename;
const FileEntry *File
= Overridden? FileMgr.getVirtualFile(Filename, StoredSize, StoredTime)