git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@244848
91177308-0d34-0410-b5e6-
96231b3b80d8
#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/DataTypes.h"
#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/DataTypes.h"
+#include "llvm/Support/ErrorOr.h"
#include "llvm/Support/FileSystem.h"
namespace llvm {
#include "llvm/Support/FileSystem.h"
namespace llvm {
/// Factory method to create an OutputBuffer object which manages a read/write
/// buffer of the specified size. When committed, the buffer will be written
/// to the file at the specified path.
/// Factory method to create an OutputBuffer object which manages a read/write
/// buffer of the specified size. When committed, the buffer will be written
/// to the file at the specified path.
- static std::error_code create(StringRef FilePath, size_t Size,
- std::unique_ptr<FileOutputBuffer> &Result,
- unsigned Flags = 0);
+ static ErrorOr<std::unique_ptr<FileOutputBuffer>>
+ create(StringRef FilePath, size_t Size, unsigned Flags = 0);
/// Returns a pointer to the start of the buffer.
uint8_t *getBufferStart() {
/// Returns a pointer to the start of the buffer.
uint8_t *getBufferStart() {
sys::fs::remove(Twine(TempPath));
}
sys::fs::remove(Twine(TempPath));
}
-std::error_code
-FileOutputBuffer::create(StringRef FilePath, size_t Size,
- std::unique_ptr<FileOutputBuffer> &Result,
- unsigned Flags) {
+ErrorOr<std::unique_ptr<FileOutputBuffer>>
+FileOutputBuffer::create(StringRef FilePath, size_t Size, unsigned Flags) {
// If file already exists, it must be a regular file (to be mappable).
sys::fs::file_status Stat;
std::error_code EC = sys::fs::status(FilePath, Stat);
// If file already exists, it must be a regular file (to be mappable).
sys::fs::file_status Stat;
std::error_code EC = sys::fs::status(FilePath, Stat);
if (Ret)
return std::error_code(errno, std::generic_category());
if (Ret)
return std::error_code(errno, std::generic_category());
+ std::unique_ptr<FileOutputBuffer> Buf(
new FileOutputBuffer(std::move(MappedFile), FilePath, TempFilePath));
new FileOutputBuffer(std::move(MappedFile), FilePath, TempFilePath));
-
- return std::error_code();
}
std::error_code FileOutputBuffer::commit() {
}
std::error_code FileOutputBuffer::commit() {
SmallString<128> File1(TestDirectory);
File1.append("/file1");
{
SmallString<128> File1(TestDirectory);
File1.append("/file1");
{
- std::unique_ptr<FileOutputBuffer> Buffer;
- ASSERT_NO_ERROR(FileOutputBuffer::create(File1, 8192, Buffer));
+ ErrorOr<std::unique_ptr<FileOutputBuffer>> BufferOrErr =
+ FileOutputBuffer::create(File1, 8192);
+ ASSERT_NO_ERROR(BufferOrErr.getError());
+ std::unique_ptr<FileOutputBuffer> &Buffer = *BufferOrErr;
// Start buffer with special header.
memcpy(Buffer->getBufferStart(), "AABBCCDDEEFFGGHHIIJJ", 20);
// Write to end of buffer to verify it is writable.
// Start buffer with special header.
memcpy(Buffer->getBufferStart(), "AABBCCDDEEFFGGHHIIJJ", 20);
// Write to end of buffer to verify it is writable.
SmallString<128> File2(TestDirectory);
File2.append("/file2");
{
SmallString<128> File2(TestDirectory);
File2.append("/file2");
{
- std::unique_ptr<FileOutputBuffer> Buffer2;
- ASSERT_NO_ERROR(FileOutputBuffer::create(File2, 8192, Buffer2));
+ ErrorOr<std::unique_ptr<FileOutputBuffer>> Buffer2OrErr =
+ FileOutputBuffer::create(File2, 8192);
+ ASSERT_NO_ERROR(Buffer2OrErr.getError());
+ std::unique_ptr<FileOutputBuffer> &Buffer2 = *Buffer2OrErr;
// Fill buffer with special header.
memcpy(Buffer2->getBufferStart(), "AABBCCDDEEFFGGHHIIJJ", 20);
// Do *not* commit buffer.
// Fill buffer with special header.
memcpy(Buffer2->getBufferStart(), "AABBCCDDEEFFGGHHIIJJ", 20);
// Do *not* commit buffer.
SmallString<128> File3(TestDirectory);
File3.append("/file3");
{
SmallString<128> File3(TestDirectory);
File3.append("/file3");
{
- std::unique_ptr<FileOutputBuffer> Buffer;
- ASSERT_NO_ERROR(FileOutputBuffer::create(File3, 8192000, Buffer));
+ ErrorOr<std::unique_ptr<FileOutputBuffer>> BufferOrErr =
+ FileOutputBuffer::create(File3, 8192000);
+ ASSERT_NO_ERROR(BufferOrErr.getError());
+ std::unique_ptr<FileOutputBuffer> &Buffer = *BufferOrErr;
// Start buffer with special header.
memcpy(Buffer->getBufferStart(), "AABBCCDDEEFFGGHHIIJJ", 20);
// Write to end of buffer to verify it is writable.
// Start buffer with special header.
memcpy(Buffer->getBufferStart(), "AABBCCDDEEFFGGHHIIJJ", 20);
// Write to end of buffer to verify it is writable.
SmallString<128> File4(TestDirectory);
File4.append("/file4");
{
SmallString<128> File4(TestDirectory);
File4.append("/file4");
{
- std::unique_ptr<FileOutputBuffer> Buffer;
- ASSERT_NO_ERROR(FileOutputBuffer::create(File4, 8192, Buffer,
- FileOutputBuffer::F_executable));
+ ErrorOr<std::unique_ptr<FileOutputBuffer>> BufferOrErr =
+ FileOutputBuffer::create(File4, 8192, FileOutputBuffer::F_executable);
+ ASSERT_NO_ERROR(BufferOrErr.getError());
+ std::unique_ptr<FileOutputBuffer> &Buffer = *BufferOrErr;
// Start buffer with special header.
memcpy(Buffer->getBufferStart(), "AABBCCDDEEFFGGHHIIJJ", 20);
// Commit buffer.
// Start buffer with special header.
memcpy(Buffer->getBufferStart(), "AABBCCDDEEFFGGHHIIJJ", 20);
// Commit buffer.