[lld] r308241 - Fix pdb-type-server-simple test on non-Windows

Reid Kleckner via llvm-commits llvm-commits at lists.llvm.org
Mon Jul 17 17:33:53 PDT 2017


Author: rnk
Date: Mon Jul 17 17:33:53 2017
New Revision: 308241

URL: http://llvm.org/viewvc/llvm-project?rev=308241&view=rev
Log:
Fix pdb-type-server-simple test on non-Windows

Assume that the LF_TYPESERVER2 record contains Windows-style paths.  In
any case, 'sys::path::filename(Path, Style::windows)' will work on
Unix-style paths.

Modified:
    lld/trunk/COFF/PDB.cpp

Modified: lld/trunk/COFF/PDB.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/PDB.cpp?rev=308241&r1=308240&r2=308241&view=diff
==============================================================================
--- lld/trunk/COFF/PDB.cpp (original)
+++ lld/trunk/COFF/PDB.cpp Mon Jul 17 17:33:53 2017
@@ -255,7 +255,8 @@ const CVIndexMap &PDBLinker::maybeMergeT
     StringRef LocalPath =
         !File->ParentName.empty() ? File->ParentName : File->getName();
     SmallString<128> Path = sys::path::parent_path(LocalPath);
-    sys::path::append(Path, sys::path::filename(TS.getName()));
+    sys::path::append(
+        Path, sys::path::filename(TS.getName(), sys::path::Style::windows));
     ExpectedSession = tryToLoadPDB(TS.getGuid(), Path);
   }
   if (auto E = ExpectedSession.takeError())




More information about the llvm-commits mailing list