From 37e409ef6a6f955d00884fb4d8e2666428930a4c Mon Sep 17 00:00:00 2001 From: Nikola Smiljanic Date: Fri, 8 May 2015 06:02:37 +0000 Subject: [PATCH] Revert "Fix path separator issue on Windows." This reverts commit 9242ff16b0460b488691fd70b42a2bf81a531e3a. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@236806 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Lex/HeaderSearch.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/Lex/HeaderSearch.cpp b/lib/Lex/HeaderSearch.cpp index b316ccae65..04cdb0f69f 100644 --- a/lib/Lex/HeaderSearch.cpp +++ b/lib/Lex/HeaderSearch.cpp @@ -614,8 +614,10 @@ const FileEntry *HeaderSearch::LookupFile( 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 -- 2.40.0