[llvm] r234615 - Have one raw_fd_ostream constructor forward to the other.

[NAKAMURA Takumi]

Rafael, I have reverted it in r234721. It broke a couple of
test/Object on msvcrt.

  http://bb.pgr.jp/builders/ninja-clang-i686-msc18-R/builds/752
  http://bb.pgr.jp/builders/ninja-clang-x64-mingw64-RA/builds/6569

2015-04-11 2:52 GMT+09:00 Rafael Espindola <rafael.espindola at gmail.com>:
> Author: rafael
> Date: Fri Apr 10 12:52:22 2015
> New Revision: 234615
>
> URL: http://llvm.org/viewvc/llvm-project?rev=234615&view=rev
> Log:
> Have one raw_fd_ostream constructor forward to the other.
>
> This fixes some odd behavior differences between the two. In particular,
> the version that takes a FD no longer unconditionally sets stdout to binary.
>
> Modified:
>     llvm/trunk/lib/Support/raw_ostream.cpp
>
> Modified: llvm/trunk/lib/Support/raw_ostream.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/raw_ostream.cpp?rev=234615&r1=234614&r2=234615&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Support/raw_ostream.cpp (original)
> +++ llvm/trunk/lib/Support/raw_ostream.cpp Fri Apr 10 12:52:22 2015
> @@ -487,47 +487,41 @@ void format_object_base::home() {
>  //  raw_fd_ostream
>  //===----------------------------------------------------------------------===//
>
> -raw_fd_ostream::raw_fd_ostream(StringRef Filename, std::error_code &EC,
> -                               sys::fs::OpenFlags Flags)
> -    : Error(false), UseAtomicWrites(false), pos(0) {
> -  EC = std::error_code();
> +static int getFD(StringRef Filename, std::error_code &EC,
> +                 sys::fs::OpenFlags Flags) {
>    // Handle "-" as stdout. Note that when we do this, we consider ourself
>    // the owner of stdout. This means that we can do things like close the
>    // file descriptor when we're done and set the "binary" flag globally.
>    if (Filename == "-") {
> -    FD = STDOUT_FILENO;
> +    EC = std::error_code();
>      // If user requested binary then put stdout into binary mode if
>      // possible.
>      if (!(Flags & sys::fs::F_Text))
>        sys::ChangeStdoutToBinary();
> -    // Close stdout when we're done, to detect any output errors.
> -    ShouldClose = true;
> -    return;
> +    return STDOUT_FILENO;
>    }
>
> +  int FD;
>    EC = sys::fs::openFileForWrite(Filename, FD, Flags);
> +  if (EC)
> +    return -1;
>
> -  if (EC) {
> -    ShouldClose = false;
> -    return;
> -  }
> -
> -  // Ok, we successfully opened the file, so it'll need to be closed.
> -  ShouldClose = true;
> +  return FD;
>  }
>
> +raw_fd_ostream::raw_fd_ostream(StringRef Filename, std::error_code &EC,
> +                               sys::fs::OpenFlags Flags)
> +    : raw_fd_ostream(getFD(Filename, EC, Flags), true) {}
> +
>  /// FD is the file descriptor that this writes to.  If ShouldClose is true, this
>  /// closes the file when the stream is destroyed.
>  raw_fd_ostream::raw_fd_ostream(int fd, bool shouldClose, bool unbuffered)
> -    : raw_ostream(unbuffered), FD(fd), ShouldClose(shouldClose), Error(false),
> -      UseAtomicWrites(false) {
> -#ifdef O_BINARY
> -  // Setting STDOUT to binary mode is necessary in Win32
> -  // to avoid undesirable linefeed conversion.
> -  // Don't touch STDERR, or w*printf() (in assert()) would barf wide chars.
> -  if (fd == STDOUT_FILENO)
> -    setmode(fd, O_BINARY);
> -#endif
> +  : raw_ostream(unbuffered), FD(fd),
> +    ShouldClose(shouldClose), Error(false), UseAtomicWrites(false) {
> +  if (FD < 0 ) {
> +    ShouldClose = false;
> +    return;
> +  }
>
>    // Get the starting position.
>    off_t loc = ::lseek(FD, 0, SEEK_CUR);
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits