For PR1291:

Change uses of sys::Path class to sys::PathWithStatus in those places where
the file status information is needed.

llvm-svn: 35743
This commit is contained in:
Reid Spencer 2007-04-07 18:53:16 +00:00
parent ceeb918dd1
commit 21b76a9b99
5 changed files with 13 additions and 8 deletions

View File

@ -195,7 +195,7 @@ void SourceFunctionInfo::getSourceLocation(unsigned &RetLineNo,
ProgramInfo::ProgramInfo(Module *m) : M(m), ProgramTimeStamp(0,0) {
assert(M && "Cannot create program information with a null module!");
const sys::FileStatus *Stat;
Stat = sys::Path(M->getModuleIdentifier()).getFileStatus();
Stat = sys::PathWithStatus(M->getModuleIdentifier()).getFileStatus();
if (Stat)
ProgramTimeStamp = Stat->getTimestamp();

View File

@ -148,8 +148,8 @@ static void PadFileIfNeeded(char *&FileStart, char *&FileEnd, char *&FP) {
/// error occurs, allowing the caller to distinguish between a failed diff and a
/// file system error.
///
int llvm::DiffFilesWithTolerance(const sys::Path &FileA,
const sys::Path &FileB,
int llvm::DiffFilesWithTolerance(const sys::PathWithStatus &FileA,
const sys::PathWithStatus &FileB,
double AbsTol, double RelTol,
std::string *Error) {
const sys::FileStatus *FileAStat = FileA.getFileStatus(false, Error);

View File

@ -281,7 +281,8 @@ recurseDirectories(const sys::Path& path,
for (std::set<sys::Path>::iterator I = content.begin(), E = content.end();
I != E; ++I) {
// Make sure it exists and is a directory
const sys::FileStatus *Status = I->getFileStatus(false, ErrMsg);
const sys::FileStatus *Status =
sys::PathWithStatus(*I).getFileStatus(false, ErrMsg);
if (!Status)
return true;
if (Status->isDir) {
@ -309,7 +310,8 @@ bool buildPaths(bool checkExistence, std::string* ErrMsg) {
if (!aPath.exists())
throw std::string("File does not exist: ") + Members[i];
std::string Err;
const sys::FileStatus *si = aPath.getFileStatus(false, &Err);
const sys::FileStatus *si =
sys::PathWithStatus(aPath).getFileStatus(false, &Err);
if (!si)
throw Err;
if (si->isDir) {
@ -645,7 +647,8 @@ doReplaceOrInsert(std::string* ErrMsg) {
if (found != remaining.end()) {
std::string Err;
const sys::FileStatus *si = found->getFileStatus(false, &Err);
const sys::FileStatus *si =
sys::PathWithStatus(*found).getFileStatus(false, &Err);
if (!si)
return true;
if (si->isDir) {

View File

@ -51,7 +51,8 @@ void CLIDebugger::startProgramRunning() {
// If the program has been modified, reload it!
sys::Path Program(Dbg.getProgramPath());
std::string Err;
const sys::FileStatus *Status = Program.getFileStatus(false, &Err);
const sys::FileStatus *Status =
sys::PathWithStatus(Program).getFileStatus(false, &Err);
if (!Status)
throw Err;
if (TheProgramInfo->getProgramTimeStamp() != Status->getTimestamp()) {

View File

@ -195,7 +195,8 @@ private:
void cleanup() {
if (!isSet(KEEP_TEMPS_FLAG)) {
const sys::FileStatus *Status = TempDir.getFileStatus();
const sys::FileStatus *Status =
sys::PathWithStatus(TempDir).getFileStatus();
if (Status && Status->isDir)
TempDir.eraseFromDisk(/*remove_contents=*/true);
} else {