[lld] r291263 - Revert r291221.

[Rafael Espindola via llvm-commits]

Author: rafael
Date: Fri Jan  6 13:01:49 2017
New Revision: 291263

URL: http://llvm.org/viewvc/llvm-project?rev=291263&view=rev
Log:
Revert r291221.

Should bring back the windows bots.

Modified:
    lld/trunk/include/lld/Core/Reproduce.h
    lld/trunk/lib/Core/Reproduce.cpp

Modified: lld/trunk/include/lld/Core/Reproduce.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/Reproduce.h?rev=291263&r1=291262&r2=291263&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/Reproduce.h (original)
+++ lld/trunk/include/lld/Core/Reproduce.h Fri Jan  6 13:01:49 2017
@@ -34,6 +34,9 @@ std::string rewritePath(StringRef S);
 
 // Returns the string form of the given argument.
 std::string toString(llvm::opt::Arg *Arg);
+
+// Replaces backslashes with slashes if Windows.
+std::string convertToUnixPathSeparator(StringRef S);
 }
 
 #endif

Modified: lld/trunk/lib/Core/Reproduce.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Core/Reproduce.cpp?rev=291263&r1=291262&r2=291263&view=diff
==============================================================================
--- lld/trunk/lib/Core/Reproduce.cpp (original)
+++ lld/trunk/lib/Core/Reproduce.cpp Fri Jan  6 13:01:49 2017
@@ -39,7 +39,7 @@ std::string lld::relativeToRoot(StringRe
     Res = Root.substr(2);
 
   path::append(Res, path::relative_path(Abs));
-  return Res.str();
+  return convertToUnixPathSeparator(Res);
 }
 
 // Quote a given string if it contains a space character.
@@ -64,3 +64,13 @@ std::string lld::toString(opt::Arg *Arg)
     return K + V;
   return K + " " + V;
 }
+
+std::string lld::convertToUnixPathSeparator(StringRef S) {
+#ifdef LLVM_ON_WIN32
+  std::string Ret = S.str();
+  std::replace(Ret.begin(), Ret.end(), '\\', '/');
+  return Ret;
+#else
+  return S;
+#endif
+}