]> granicus.if.org Git - llvm/commitdiff
[Support] Don't return an error if realPath fails.
authorZachary Turner <zturner@google.com>
Fri, 10 Mar 2017 18:33:41 +0000 (18:33 +0000)
committerZachary Turner <zturner@google.com>
Fri, 10 Mar 2017 18:33:41 +0000 (18:33 +0000)
In openFileForRead, we would not previously return an error
if real_path resolution failed.  After a recent patch, we
started propagating this error up.  This caused a failure
in clang when trying to call openFileForRead("nul").  This
patch restores the previous behavior of not propagating this
error up.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@297488 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Support/Windows/Path.inc

index c7582894fa9dd0f46227ed74f5f565986b321deb..d8a14b41cb2bc06f13eedaf192b909f004f72efa 100644 (file)
@@ -857,12 +857,11 @@ std::error_code openFileForRead(const Twine &Name, int &ResultFD,
   }
 
   // Fetch the real name of the file, if the user asked
-  std::error_code EC;
   if (RealPath)
-    EC = realPathFromHandle(H, *RealPath);
+    realPathFromHandle(H, *RealPath);
 
   ResultFD = FD;
-  return EC;
+  return std::error_code();
 }
 
 std::error_code openFileForWrite(const Twine &Name, int &ResultFD,