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

Fix assumption about Win32 paths in r360833 

Attempt to fix Windows buildbots due to differences in
path handling (caused by r360833).

llvm-svn: 360839
This commit is contained in:
Kristina Brooks 2019-05-16 02:46:12 +00:00
parent 7d4761928e
commit 69e927662d
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clang/lib/Lex/PPMacroExpansion.cpp
View File

@ -1501,8 +1501,14 @@ void Preprocessor::ExpandBuiltinMacro(Token &Tok) {
// the last part of __FILE__.
if (II == Ident__FILE_NAME__) {
// Try to get the last path component.
StringRef PLFileName = PLoc.getFilename();
size_t LastSep = PLFileName.find_last_of('/');
StringRef PLFileName = PLoc.getFilename();
size_t LastSep = PLFileName.find_last_of('/');
#ifdef _WIN32
// On Windows targets, absolute paths can be normalized to use
// backslashes instead - handle this potential case here.
if (LastSep == StringRef::npos)
LastSep = PLFileName.find_last_of('\\');
#endif
// Skip the separator and get the last part, otherwise fall back on
// returning the original full filename.
if (LastSep != StringRef::npos)