<div dir="auto">Looks like this helped :-/<div dir="auto"><br></div><div dir="auto"><a href="http://lab.llvm.org:8011/builders/clang-x64-ninja-win7/builds/10262">http://lab.llvm.org:8011/builders/clang-x64-ninja-win7/builds/10262</a><br></div></div><br><div class="gmail_quote"><div dir="ltr">On Fri, Apr 27, 2018, 4:33 PM Nico Weber via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: nico<br>
Date: Fri Apr 27 13:29:57 2018<br>
New Revision: 331077<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=331077&view=rev" rel="noreferrer noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=331077&view=rev</a><br>
Log:<br>
Revert r329698 (and r329702).<br>
<br>
Speculative. ClangMoveTests started failing on<br>
<a href="http://lab.llvm.org:8011/builders/clang-x64-ninja-win7/builds/9958" rel="noreferrer noreferrer" target="_blank">http://lab.llvm.org:8011/builders/clang-x64-ninja-win7/builds/9958</a><br>
after this change. I can't reproduce on my machine, let's see<br>
if it was due to this change.<br>
<br>
Modified:<br>
cfe/trunk/lib/Basic/FileManager.cpp<br>
cfe/trunk/lib/Frontend/ModuleDependencyCollector.cpp<br>
<br>
Modified: cfe/trunk/lib/Basic/FileManager.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/FileManager.cpp?rev=331077&r1=331076&r2=331077&view=diff" rel="noreferrer noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/FileManager.cpp?rev=331077&r1=331076&r2=331077&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Basic/FileManager.cpp (original)<br>
+++ cfe/trunk/lib/Basic/FileManager.cpp Fri Apr 27 13:29:57 2018<br>
@@ -534,9 +534,23 @@ StringRef FileManager::getCanonicalName(<br>
<br>
StringRef CanonicalName(Dir->getName());<br>
<br>
- SmallString<256> CanonicalNameBuf;<br>
- if (!llvm::sys::fs::real_path(Dir->getName(), CanonicalNameBuf))<br>
+#ifdef LLVM_ON_UNIX<br>
+ char CanonicalNameBuf[PATH_MAX];<br>
+ if (realpath(Dir->getName().str().c_str(), CanonicalNameBuf))<br>
CanonicalName = StringRef(CanonicalNameBuf).copy(CanonicalNameStorage);<br>
+#else<br>
+ SmallString<256> CanonicalNameBuf(CanonicalName);<br>
+ llvm::sys::fs::make_absolute(CanonicalNameBuf);<br>
+ llvm::sys::path::native(CanonicalNameBuf);<br>
+ // We've run into needing to remove '..' here in the wild though, so<br>
+ // remove it.<br>
+ // On Windows, symlinks are significantly less prevalent, so removing<br>
+ // '..' is pretty safe.<br>
+ // Ideally we'd have an equivalent of `realpath` and could implement<br>
+ // sys::fs::canonical across all the platforms.<br>
+ llvm::sys::path::remove_dots(CanonicalNameBuf, /* remove_dot_dot */ true);<br>
+ CanonicalName = StringRef(CanonicalNameBuf).copy(CanonicalNameStorage);<br>
+#endif<br>
<br>
CanonicalDirNames.insert(std::make_pair(Dir, CanonicalName));<br>
return CanonicalName;<br>
<br>
Modified: cfe/trunk/lib/Frontend/ModuleDependencyCollector.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/ModuleDependencyCollector.cpp?rev=331077&r1=331076&r2=331077&view=diff" rel="noreferrer noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/ModuleDependencyCollector.cpp?rev=331077&r1=331076&r2=331077&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Frontend/ModuleDependencyCollector.cpp (original)<br>
+++ cfe/trunk/lib/Frontend/ModuleDependencyCollector.cpp Fri Apr 27 13:29:57 2018<br>
@@ -97,6 +97,24 @@ struct ModuleDependencyMMCallbacks : pub<br>
<br>
}<br>
<br>
+// TODO: move this to Support/Path.h and check for HAVE_REALPATH?<br>
+static bool real_path(StringRef SrcPath, SmallVectorImpl<char> &RealPath) {<br>
+#ifdef LLVM_ON_UNIX<br>
+ char CanonicalPath[PATH_MAX];<br>
+<br>
+ // TODO: emit a warning in case this fails...?<br>
+ if (!realpath(SrcPath.str().c_str(), CanonicalPath))<br>
+ return false;<br>
+<br>
+ SmallString<256> RPath(CanonicalPath);<br>
+ RealPath.swap(RPath);<br>
+ return true;<br>
+#else<br>
+ // FIXME: Add support for systems without realpath.<br>
+ return false;<br>
+#endif<br>
+}<br>
+<br>
void ModuleDependencyCollector::attachToASTReader(ASTReader &R) {<br>
R.addListener(llvm::make_unique<ModuleDependencyListener>(*this));<br>
}<br>
@@ -111,7 +129,7 @@ void ModuleDependencyCollector::attachTo<br>
static bool isCaseSensitivePath(StringRef Path) {<br>
SmallString<256> TmpDest = Path, UpperDest, RealDest;<br>
// Remove component traversals, links, etc.<br>
- if (llvm::sys::fs::real_path(Path, TmpDest))<br>
+ if (!real_path(Path, TmpDest))<br>
return true; // Current default value in vfs.yaml<br>
Path = TmpDest;<br>
<br>
@@ -121,7 +139,7 @@ static bool isCaseSensitivePath(StringRe<br>
// already expects when sensitivity isn't setup.<br>
for (auto &C : Path)<br>
UpperDest.push_back(toUppercase(C));<br>
- if (!llvm::sys::fs::real_path(UpperDest, RealDest) && Path.equals(RealDest))<br>
+ if (real_path(UpperDest, RealDest) && Path.equals(RealDest))<br>
return false;<br>
return true;<br>
}<br>
@@ -171,7 +189,7 @@ bool ModuleDependencyCollector::getRealP<br>
// Computing the real path is expensive, cache the search through the<br>
// parent path directory.<br>
if (DirWithSymLink == SymLinkMap.end()) {<br>
- if (llvm::sys::fs::real_path(Dir, RealPath))<br>
+ if (!real_path(Dir, RealPath))<br>
return false;<br>
SymLinkMap[Dir] = RealPath.str();<br>
} else {<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank" rel="noreferrer">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div>