[llvm] r317739 - [FileOutputBuffer] Move factory methods out of their classes.

[Rafael Avila de Espindola via llvm-commits]

Thanks!
Rui Ueyama via llvm-commits <llvm-commits at lists.llvm.org> writes:

> Author: ruiu
> Date: Wed Nov  8 14:57:48 2017
> New Revision: 317739
>
> URL: http://llvm.org/viewvc/llvm-project?rev=317739&view=rev
> Log:
> [FileOutputBuffer] Move factory methods out of their classes.
>
> InMemoryBuffer and OnDiskBuffer classes have both factory methods and
> public constructors, and that looks a bit odd. This patch makes factory
> methods non-member function to fix it.
>
> Differential Revision: https://reviews.llvm.org/D39693
>
> Modified:
>     llvm/trunk/lib/Support/FileOutputBuffer.cpp
>
> Modified: llvm/trunk/lib/Support/FileOutputBuffer.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/FileOutputBuffer.cpp?rev=317739&r1=317738&r2=317739&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Support/FileOutputBuffer.cpp (original)
> +++ llvm/trunk/lib/Support/FileOutputBuffer.cpp Wed Nov  8 14:57:48 2017
> @@ -38,9 +38,6 @@ public:
>                 std::unique_ptr<fs::mapped_file_region> Buf)
>        : FileOutputBuffer(Path), Buffer(std::move(Buf)), TempPath(TempPath) {}
>  
> -  static Expected<std::unique_ptr<OnDiskBuffer>>
> -  create(StringRef Path, size_t Size, unsigned Mode);
> -
>    uint8_t *getBufferStart() const override { return (uint8_t *)Buffer->data(); }
>  
>    uint8_t *getBufferEnd() const override {
> @@ -78,16 +75,6 @@ public:
>    InMemoryBuffer(StringRef Path, MemoryBlock Buf, unsigned Mode)
>        : FileOutputBuffer(Path), Buffer(Buf), Mode(Mode) {}
>  
> -  static Expected<std::unique_ptr<InMemoryBuffer>>
> -  create(StringRef Path, size_t Size, unsigned Mode) {
> -    std::error_code EC;
> -    MemoryBlock MB = Memory::allocateMappedMemory(
> -        Size, nullptr, sys::Memory::MF_READ | sys::Memory::MF_WRITE, EC);
> -    if (EC)
> -      return errorCodeToError(EC);
> -    return llvm::make_unique<InMemoryBuffer>(Path, MB, Mode);
> -  }
> -
>    uint8_t *getBufferStart() const override { return (uint8_t *)Buffer.base(); }
>  
>    uint8_t *getBufferEnd() const override {
> @@ -111,8 +98,18 @@ private:
>    unsigned Mode;
>  };
>  
> -Expected<std::unique_ptr<OnDiskBuffer>>
> -OnDiskBuffer::create(StringRef Path, size_t Size, unsigned Mode) {
> +static Expected<std::unique_ptr<InMemoryBuffer>>
> +createInMemoryBuffer(StringRef Path, size_t Size, unsigned Mode) {
> +  std::error_code EC;
> +  MemoryBlock MB = Memory::allocateMappedMemory(
> +      Size, nullptr, sys::Memory::MF_READ | sys::Memory::MF_WRITE, EC);
> +  if (EC)
> +    return errorCodeToError(EC);
> +  return llvm::make_unique<InMemoryBuffer>(Path, MB, Mode);
> +}
> +
> +static Expected<std::unique_ptr<OnDiskBuffer>>
> +createOnDiskBuffer(StringRef Path, size_t Size, unsigned Mode) {
>    // Create new file in same directory but with random name.
>    SmallString<128> TempPath;
>    int FD;
> @@ -165,8 +162,8 @@ FileOutputBuffer::create(StringRef Path,
>    case fs::file_type::regular_file:
>    case fs::file_type::file_not_found:
>    case fs::file_type::status_error:
> -    return OnDiskBuffer::create(Path, Size, Mode);
> +    return createOnDiskBuffer(Path, Size, Mode);
>    default:
> -    return InMemoryBuffer::create(Path, Size, Mode);
> +    return createInMemoryBuffer(Path, Size, Mode);
>    }
>  }
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits