r236806 - Revert "Fix path separator issue on Windows."

[Nikola Smiljanic]

Author: nikola
Date: Fri May  8 01:02:37 2015
New Revision: 236806

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

This reverts commit 9242ff16b0460b488691fd70b42a2bf81a531e3a.

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=236806&r1=236805&r2=236806&view=diff
==============================================================================
--- cfe/trunk/lib/Lex/HeaderSearch.cpp (original)
+++ cfe/trunk/lib/Lex/HeaderSearch.cpp Fri May  8 01:02:37 2015
@@ -614,8 +614,10 @@ 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();
-      llvm::sys::path::append(TmpDir, Filename);
+      TmpDir.push_back('/');
+      TmpDir.append(Filename.begin(), Filename.end());
 
       // FIXME: We don't cache the result of getFileInfo across the call to
       // getFileAndSuggestModule, because it's a reference to an element of