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

Yaron Keren yaron.keren at gmail.com
Fri May 8 03:53:45 PDT 2015


Yep, the remap test is the result of having two entries with different
slashes in the FileManager. I looked into this some time ago.



2015-05-08 12:53 GMT+03:00 Nikola Smiljanic <popizdeh at gmail.com>:

> Well only 4 tests failed, and three of those are not real failures,
> they're matching slashes. The fourth one is real failure, -remap-file seems
> to break with my change, I didn't have time to investigate.


On Fri, May 8, 2015 at 7:30 PM, Yaron Keren <yaron.keren at gmail.com> wrote:

> I think this can't be fixed until FileManager is case- and slash-
> insensitive on Windows, matching the OS behaviour. See
> http://llvm.org/pr17993
>
>
> 2015-05-08 9:02 GMT+03:00 Nikola Smiljanic <popizdeh at gmail.com>:
>
>> 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
>>
>>
>> _______________________________________________
>> cfe-commits mailing list
>> cfe-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20150508/38c4c6b8/attachment.html>


More information about the cfe-commits mailing list