[llvm] r369027 - Revert "MemoryBuffer: Add a missing error-check to getOpenFileImpl"
Pavel Labath via llvm-commits
llvm-commits at lists.llvm.org
Thu Aug 15 10:52:40 PDT 2019
Author: labath
Date: Thu Aug 15 10:52:40 2019
New Revision: 369027
URL: http://llvm.org/viewvc/llvm-project?rev=369027&view=rev
Log:
Revert "MemoryBuffer: Add a missing error-check to getOpenFileImpl"
This reverts commit r368977 because it broke a couple of tests in lldb.
Modified:
llvm/trunk/lib/Support/MemoryBuffer.cpp
llvm/trunk/unittests/Support/MemoryBufferTest.cpp
Modified: llvm/trunk/lib/Support/MemoryBuffer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/MemoryBuffer.cpp?rev=369027&r1=369026&r2=369027&view=diff
==============================================================================
--- llvm/trunk/lib/Support/MemoryBuffer.cpp (original)
+++ llvm/trunk/lib/Support/MemoryBuffer.cpp Thu Aug 15 10:52:40 2019
@@ -458,9 +458,7 @@ getOpenFileImpl(sys::fs::file_t FD, cons
return make_error_code(errc::not_enough_memory);
}
- if (std::error_code EC =
- sys::fs::readNativeFileSlice(FD, Buf->getBuffer(), Offset))
- return EC;
+ sys::fs::readNativeFileSlice(FD, Buf->getBuffer(), Offset);
return std::move(Buf);
}
Modified: llvm/trunk/unittests/Support/MemoryBufferTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/MemoryBufferTest.cpp?rev=369027&r1=369026&r2=369027&view=diff
==============================================================================
--- llvm/trunk/unittests/Support/MemoryBufferTest.cpp (original)
+++ llvm/trunk/unittests/Support/MemoryBufferTest.cpp Thu Aug 15 10:52:40 2019
@@ -11,7 +11,6 @@
//===----------------------------------------------------------------------===//
#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/ADT/ScopeExit.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/FileUtilities.h"
#include "llvm/Support/raw_ostream.h"
@@ -20,25 +19,6 @@
using namespace llvm;
-#define ASSERT_NO_ERROR(x) \
- if (std::error_code ASSERT_NO_ERROR_ec = x) { \
- SmallString<128> MessageStorage; \
- raw_svector_ostream Message(MessageStorage); \
- Message << #x ": did not return errc::success.\n" \
- << "error number: " << ASSERT_NO_ERROR_ec.value() << "\n" \
- << "error message: " << ASSERT_NO_ERROR_ec.message() << "\n"; \
- GTEST_FATAL_FAILURE_(MessageStorage.c_str()); \
- } else { \
- }
-
-#define ASSERT_ERROR(x) \
- if (!x) { \
- SmallString<128> MessageStorage; \
- raw_svector_ostream Message(MessageStorage); \
- Message << #x ": did not return a failure error code.\n"; \
- GTEST_FATAL_FAILURE_(MessageStorage.c_str()); \
- }
-
namespace {
class MemoryBufferTest : public testing::Test {
@@ -85,37 +65,6 @@ TEST_F(MemoryBufferTest, get) {
EXPECT_EQ("this is some data", data);
}
-TEST_F(MemoryBufferTest, getOpenFile) {
- int FD;
- SmallString<64> TestPath;
- ASSERT_EQ(sys::fs::createTemporaryFile("MemoryBufferTest_getOpenFile", "temp",
- FD, TestPath),
- std::error_code());
-
- FileRemover Cleanup(TestPath);
- raw_fd_ostream OF(FD, /*shouldClose*/ true);
- OF << "12345678";
- OF.close();
-
- {
- Expected<sys::fs::file_t> File = sys::fs::openNativeFileForRead(TestPath);
- ASSERT_THAT_EXPECTED(File, Succeeded());
- auto OnExit =
- make_scope_exit([&] { ASSERT_NO_ERROR(sys::fs::closeFile(*File)); });
- ErrorOr<OwningBuffer> MB = MemoryBuffer::getOpenFile(*File, TestPath, 6);
- ASSERT_NO_ERROR(MB.getError());
- EXPECT_EQ("123456", MB.get()->getBuffer());
- }
- {
- Expected<sys::fs::file_t> File = sys::fs::openNativeFileForWrite(
- TestPath, sys::fs::CD_OpenExisting, sys::fs::OF_None);
- ASSERT_THAT_EXPECTED(File, Succeeded());
- auto OnExit =
- make_scope_exit([&] { ASSERT_NO_ERROR(sys::fs::closeFile(*File)); });
- ASSERT_ERROR(MemoryBuffer::getOpenFile(*File, TestPath, 6).getError());
- }
-}
-
TEST_F(MemoryBufferTest, NullTerminator4K) {
// Test that a file with size that is a multiple of the page size can be null
// terminated correctly by MemoryBuffer.
More information about the llvm-commits
mailing list