Fix assumption about Win32 paths in r360833
authorKristina Brooks <notstina@gmail.com>
Thu, 16 May 2019 02:46:12 +0000 (02:46 +0000)
committerKristina Brooks <notstina@gmail.com>
Thu, 16 May 2019 02:46:12 +0000 (02:46 +0000)
Attempt to fix Windows buildbots due to differences in
path handling (caused by r360833).

llvm-svn: 360839

clang/lib/Lex/PPMacroExpansion.cpp

index 148fc67..bc25dcd 100644 (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)