[llvm] r204540 - llvm-profdata: Avoid F_Text in "merge" for now, since "llvm-profdata show" is confused with CRLF.

NAKAMURA Takumi geek4civic at gmail.com
Fri Mar 21 22:38:22 PDT 2014


Author: chapuni
Date: Sat Mar 22 00:38:22 2014
New Revision: 204540

URL: http://llvm.org/viewvc/llvm-project?rev=204540&view=rev
Log:
llvm-profdata: Avoid F_Text in "merge" for now, since "llvm-profdata show" is confused with CRLF.

FIXME: line_iterator should be tolerant of CR.

Modified:
    llvm/trunk/tools/llvm-profdata/llvm-profdata.cpp

Modified: llvm/trunk/tools/llvm-profdata/llvm-profdata.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-profdata/llvm-profdata.cpp?rev=204540&r1=204539&r2=204540&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-profdata/llvm-profdata.cpp (original)
+++ llvm/trunk/tools/llvm-profdata/llvm-profdata.cpp Sat Mar 22 00:38:22 2014
@@ -47,7 +47,8 @@ int merge_main(int argc, const char *arg
     OutputFilename = "-";
 
   std::string ErrorInfo;
-  raw_fd_ostream Output(OutputFilename.data(), ErrorInfo, sys::fs::F_Text);
+  // FIXME: F_Text would be available if line_iterator could accept CRLF.
+  raw_fd_ostream Output(OutputFilename.data(), ErrorInfo, sys::fs::F_None);
   if (!ErrorInfo.empty())
     exitWithError(ErrorInfo, OutputFilename);
 





More information about the llvm-commits mailing list