<div dir="ltr">Thanks!</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Mar 11, 2014 at 7:32 PM, Saleem Abdulrasool <span dir="ltr"><<a href="mailto:compnerd@compnerd.org" target="_blank">compnerd@compnerd.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><div class="">On Tue, Mar 11, 2014 at 3:55 PM, Nico Weber <span dir="ltr"><<a href="mailto:thakis@chromium.org" target="_blank">thakis@chromium.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div dir="ltr">Huh, did you see Richard's comments on the review for this patch?</div>
</blockquote><div><br></div></div><div>No, sorry, I didnt see them. Addressed in a follow up commit (SVN r203632).</div><div><div class="h5"><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<div><div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Mar 11, 2014 at 3:41 PM, Saleem Abdulrasool <span dir="ltr"><<a href="mailto:compnerd@compnerd.org" target="_blank">compnerd@compnerd.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">Author: compnerd<br>
Date: Tue Mar 11 17:41:45 2014<br>
New Revision: 203614<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=203614&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=203614&view=rev</a><br>
Log:<br>
lex: improve include handling on Linux for Windows<br>
<br>
Normalise the path separator character on non-windows platforms. Although this<br>
would work on Windows as well (most newer versions of Windows support either '/'<br>
or '\' as a path separator character), it could potentially cause problems with<br>
full UNC paths. This change enables the use of the Windows SDK on Linux which<br>
will not accept '\' as a path separator.<br>
<br>
Modified:<br>
cfe/trunk/lib/Lex/PPDirectives.cpp<br>
<br>
Modified: cfe/trunk/lib/Lex/PPDirectives.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/PPDirectives.cpp?rev=203614&r1=203613&r2=203614&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/PPDirectives.cpp?rev=203614&r1=203613&r2=203614&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Lex/PPDirectives.cpp (original)<br>
+++ cfe/trunk/lib/Lex/PPDirectives.cpp Tue Mar 11 17:41:45 2014<br>
@@ -25,6 +25,7 @@<br>
#include "clang/Lex/Pragma.h"<br>
#include "llvm/ADT/APInt.h"<br>
#include "llvm/Support/ErrorHandling.h"<br>
+#include "llvm/Support/FileSystem.h"<br>
#include "llvm/Support/SaveAndRestore.h"<br>
using namespace clang;<br>
<br>
@@ -1449,9 +1450,15 @@ void Preprocessor::HandleIncludeDirectiv<br>
// the path.<br>
ModuleMap::KnownHeader SuggestedModule;<br>
SourceLocation FilenameLoc = FilenameTok.getLocation();<br>
+ SmallString<1024> NormalizedPath;<br>
+ if (LangOpts.MSVCCompat) {<br>
+ NormalizedPath = Filename.str();<br>
+ llvm::sys::fs::normalize_separators(NormalizedPath);<br>
+ }<br>
const FileEntry *File = LookupFile(<br>
- FilenameLoc, Filename, isAngled, LookupFrom, CurDir,<br>
- Callbacks ? &SearchPath : NULL, Callbacks ? &RelativePath : NULL,<br>
+ FilenameLoc, LangOpts.MSVCCompat ? NormalizedPath.c_str() : Filename,<br>
+ isAngled, LookupFrom, CurDir, Callbacks ? &SearchPath : NULL,<br>
+ Callbacks ? &RelativePath : NULL,<br>
HeaderInfo.getHeaderSearchOpts().ModuleMaps ? &SuggestedModule : 0);<br>
<br>
if (Callbacks) {<br>
@@ -1465,8 +1472,11 @@ void Preprocessor::HandleIncludeDirectiv<br>
HeaderInfo.AddSearchPath(DL, isAngled);<br>
<br>
// Try the lookup again, skipping the cache.<br>
- File = LookupFile(FilenameLoc, Filename, isAngled, LookupFrom, CurDir,<br>
- 0, 0, HeaderInfo.getHeaderSearchOpts().ModuleMaps<br>
+ File = LookupFile(FilenameLoc,<br>
+ LangOpts.MSVCCompat ? NormalizedPath.c_str()<br>
+ : Filename,<br>
+ isAngled, LookupFrom, CurDir, 0, 0,<br>
+ HeaderInfo.getHeaderSearchOpts().ModuleMaps<br>
? &SuggestedModule<br>
: 0,<br>
/*SkipCache*/ true);<br>
@@ -1476,10 +1486,11 @@ void Preprocessor::HandleIncludeDirectiv<br>
<br>
if (!SuggestedModule || !getLangOpts().Modules) {<br>
// Notify the callback object that we've seen an inclusion directive.<br>
- Callbacks->InclusionDirective(HashLoc, IncludeTok, Filename, isAngled,<br>
- FilenameRange, File,<br>
- SearchPath, RelativePath,<br>
- /*ImportedModule=*/0);<br>
+ Callbacks->InclusionDirective(HashLoc, IncludeTok,<br>
+ LangOpts.MSVCCompat ? NormalizedPath.c_str()<br>
+ : Filename,<br>
+ isAngled, FilenameRange, File, SearchPath,<br>
+ RelativePath, /*ImportedModule=*/0);<br>
}<br>
}<br>
<br>
@@ -1490,8 +1501,9 @@ void Preprocessor::HandleIncludeDirectiv<br>
// provide the user with a possible fixit.<br>
if (isAngled) {<br>
File = LookupFile(<br>
- FilenameLoc, Filename, false, LookupFrom, CurDir,<br>
- Callbacks ? &SearchPath : 0, Callbacks ? &RelativePath : 0,<br>
+ FilenameLoc, LangOpts.MSVCCompat ? NormalizedPath.c_str() : Filename,<br>
+ false, LookupFrom, CurDir, Callbacks ? &SearchPath : 0,<br>
+ Callbacks ? &RelativePath : 0,<br>
HeaderInfo.getHeaderSearchOpts().ModuleMaps ? &SuggestedModule : 0);<br>
if (File) {<br>
SourceRange Range(FilenameTok.getLocation(), CharEnd);<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu" target="_blank">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>
</div></div></blockquote></div></div></div><span class="HOEnZb"><font color="#888888"><br><br clear="all"><div><br></div>-- <br>Saleem Abdulrasool<br>compnerd (at) compnerd (dot) org
</font></span></div></div>
</blockquote></div><br></div>