RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 12:41:49 +01:00
Code Issues Projects Releases Wiki Activity

Revert "raw_ostream: add operator<< overload for std::error_code"

Browse Source 
This reverts commit r368849, because it breaks some bots (e.g.
llvm-clang-x86_64-win-fast).

It turns out this is not as NFC as we had hoped, because operator== will
consider two std::error_codes to be distinct even though they both hold
"success" values if they have different categories.

llvm-svn: 368854
This commit is contained in:
Pavel Labath 2019-08-14 13:59:04 +00:00
parent 2c377876d9
commit 623bce661a
10 changed files with 78 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/llvm/Support/raw_ostream.h
View File

@ -223,8 +223,6 @@ public:
raw_ostream &operator<<(double N);
raw_ostream &operator<<(std::error_code EC);
/// Output \p N in hexadecimal, without any prefix or padding.
raw_ostream &write_hex(unsigned long long N);

5
lib/Support/raw_ostream.cpp
View File

@ -139,11 +139,6 @@ raw_ostream &raw_ostream::operator<<(long long N) {
return *this;
}
raw_ostream &raw_ostream::operator<<(std::error_code EC) {
return *this << EC.message() << " (" << EC.category().name() << ':'
<< EC.value() << ')';
}
raw_ostream &raw_ostream::write_hex(unsigned long long N) {
llvm::write_hex(*this, N, HexPrintStyle::Lower);
return *this;

11
unittests/BinaryFormat/TestFileMagic.cpp
View File

@ -17,7 +17,16 @@
using namespace llvm;
namespace fs = llvm::sys::fs;
#define ASSERT_NO_ERROR(x) ASSERT_EQ(x, std::error_code())
#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 { \
}
class MagicTest : public testing::Test {
protected:

9
unittests/Support/ErrorTest.cpp
View File

@ -933,7 +933,7 @@ public:
class TestErrorCategory : public std::error_category {
public:
const char *name() const noexcept override { return "test_error"; }
const char *name() const noexcept override { return "error"; }
std::string message(int Condition) const override {
switch (static_cast<test_error_code>(Condition)) {
case test_error_code::unspecified:
@ -975,11 +975,4 @@ TEST(Error, SubtypeStringErrorTest) {
0);
}
TEST(Error, error_codeErrorMessageTest) {
EXPECT_NONFATAL_FAILURE(
EXPECT_EQ(make_error_code(test_error_code::unspecified),
make_error_code(test_error_code::error_2)),
"Which is: An unknown error has occurred. (test_error:1)");
}
} // namespace

11
unittests/Support/FileOutputBufferTest.cpp
View File

@ -18,7 +18,16 @@
using namespace llvm;
using namespace llvm::sys;
#define ASSERT_NO_ERROR(x) ASSERT_EQ(x, std::error_code())
#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 { \
}
namespace {
TEST(FileOutputBuffer, Test) {

11
unittests/Support/Host.cpp
View File

@ -16,7 +16,16 @@
#include "gtest/gtest.h"
#define ASSERT_NO_ERROR(x) ASSERT_EQ(x, std::error_code())
#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 { \
}
using namespace llvm;

22
unittests/Support/Path.cpp
View File

@ -38,8 +38,24 @@
using namespace llvm;
using namespace llvm::sys;
#define ASSERT_NO_ERROR(x) ASSERT_EQ(x, std::error_code())
#define ASSERT_ERROR(x) ASSERT_NE(x, std::error_code())
#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 {
@ -1249,7 +1265,7 @@ TEST_F(FileSystemTest, OpenFileForRead) {
int FileDescriptor2;
SmallString<64> ResultPath;
ASSERT_NO_ERROR(fs::openFileForRead(Twine(TempPath), FileDescriptor2,
fs::OF_None, &ResultPath));
fs::OF_None, &ResultPath))
// If we succeeded, check that the paths are the same (modulo case):
if (!ResultPath.empty()) {

12
unittests/Support/ProgramTest.cpp
View File

@ -35,8 +35,16 @@ void sleep_for(unsigned int seconds) {
#error sleep_for is not implemented on your platform.
#endif
#define ASSERT_NO_ERROR(x) ASSERT_EQ(x, std::error_code())
#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 { \
}
// From TestMain.cpp.
extern const char *TestMainArgv0;

9
unittests/Support/ReplaceFileTest.cpp
View File

@ -17,7 +17,14 @@
using namespace llvm;
using namespace llvm::sys;
#define ASSERT_NO_ERROR(x) ASSERT_EQ(x, std::error_code())
#define ASSERT_NO_ERROR(x) \
do { \
if (std::error_code ASSERT_NO_ERROR_ec = x) { \
errs() << #x ": did not return errc::success.\n" \
<< "error number: " << ASSERT_NO_ERROR_ec.value() << "\n" \
<< "error message: " << ASSERT_NO_ERROR_ec.message() << "\n"; \
} \
} while (false)
namespace {
std::error_code CreateFileWithContent(const SmallString<128> &FilePath,

11
unittests/Support/raw_pwrite_stream_test.cpp
View File

@ -15,7 +15,16 @@
using namespace llvm;
#define ASSERT_NO_ERROR(x) ASSERT_EQ(x, std::error_code())
#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 { \
}
namespace {