r236804 - Fix path separator issue on Windows.

[Nikola Smiljanic]

Author: nikola
Date: Thu May  7 22:26:15 2015
New Revision: 236804

URL: http://llvm.org/viewvc/llvm-project?rev=236804&view=rev
Log:
Fix path separator issue on Windows.

Modified:
    cfe/trunk/lib/Lex/HeaderSearch.cpp

Modified: cfe/trunk/lib/Lex/HeaderSearch.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/HeaderSearch.cpp?rev=236804&r1=236803&r2=236804&view=diff
==============================================================================
--- cfe/trunk/lib/Lex/HeaderSearch.cpp (original)
+++ cfe/trunk/lib/Lex/HeaderSearch.cpp Thu May  7 22:26:15 2015
@@ -614,10 +614,8 @@ const FileEntry *HeaderSearch::LookupFil
       const FileEntry *Includer = IncluderAndDir.first;
 
       // Concatenate the requested file onto the directory.
-      // FIXME: Portability.  Filename concatenation should be in sys::Path.
       TmpDir = IncluderAndDir.second->getName();
-      TmpDir.push_back('/');
-      TmpDir.append(Filename.begin(), Filename.end());
+      llvm::sys::path::append(TmpDir, Filename);
 
       // FIXME: We don't cache the result of getFileInfo across the call to
       // getFileAndSuggestModule, because it's a reference to an element of