nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use new utility function to clean leading junk from pathnames. NFC

Browse Source 
llvm-svn: 246714
This commit is contained in:
Douglas Katzman
2015-09-02 21:14:53 +00:00
parent dab35f317d
commit 7f43af57db
2 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
clang/lib/Frontend/DependencyFile.cpp
View File

@@ -51,15 +51,8 @@ struct DepCollectorPPCallbacks : public PPCallbacks {
if (!FE)
return;
StringRef Filename = FE->getName();
// Remove leading "./" (or ".//" or "././" etc.)
while (Filename.size() > 2 && Filename[0] == '.' &&
llvm::sys::path::is_separator(Filename[1])) {
Filename = Filename.substr(1);
while (llvm::sys::path::is_separator(Filename[0]))
Filename = Filename.substr(1);
}
StringRef Filename =
llvm::sys::path::remove_leading_dotslash(FE->getName());
DepCollector.maybeAddDependency(Filename, /*FromModule*/false,
FileType != SrcMgr::C_User,
@@ -295,15 +288,7 @@ void DFGImpl::FileChanged(SourceLocation Loc,
if (!FileMatchesDepCriteria(Filename.data(), FileType))
return;
// Remove leading "./" (or ".//" or "././" etc.)
while (Filename.size() > 2 && Filename[0] == '.' &&
llvm::sys::path::is_separator(Filename[1])) {
Filename = Filename.substr(1);
while (llvm::sys::path::is_separator(Filename[0]))
Filename = Filename.substr(1);
}
AddFilename(Filename);
AddFilename(llvm::sys::path::remove_leading_dotslash(Filename));
}
void DFGImpl::InclusionDirective(SourceLocation HashLoc,