diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-11 19:05:50 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-11 19:05:50 +0000 |
commit | 7acd886ecfa0adc8a14476eafe8cf1fa981cfe18 (patch) | |
tree | 28c91d4858225f439de5d76169b368659cbbb448 /unittests | |
parent | 9ce94d7df4acff893bf095323250b8a84663a1fd (diff) | |
download | llvm-7acd886ecfa0adc8a14476eafe8cf1fa981cfe18.tar.gz llvm-7acd886ecfa0adc8a14476eafe8cf1fa981cfe18.tar.bz2 llvm-7acd886ecfa0adc8a14476eafe8cf1fa981cfe18.tar.xz |
Use std::error_code instead of llvm::error_code.
The idea of this patch is to turn llvm/Support/system_error.h into a
transitional header that just brings in the erorr_code api to the llvm
namespace. I will remove it shortly afterwards.
The cases where the general idea needed some tweaking:
* std::errc is a namespace in msvc, so we cannot use "using std::errc". I could
add an #ifdef, but there were not that many uses, so I just added std:: to
them in this patch.
* Template specialization had to be moved to the std namespace in this
patch set already.
* The msvc implementation of default_error_condition doesn't seem to
provide the same transformations as we need. Not too surprising since
the standard doesn't actually say what "equivalent" means. I fixed the
problem by keeping our old mapping and using it at error_code
construction time.
Despite these shortcomings I think this is still a good thing. Some reasons:
* The different implementations of system_error might improve over time.
* It removes 925 lines of code from llvm already.
* It removes 6313 bytes from the text segment of the clang binary when
it is built with gcc and 2816 bytes when building with clang and
libstdc++.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210687 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'unittests')
-rw-r--r-- | unittests/Support/ErrorOrTest.cpp | 4 | ||||
-rw-r--r-- | unittests/Support/Path.cpp | 8 | ||||
-rw-r--r-- | unittests/Transforms/DebugIR/DebugIR.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/unittests/Support/ErrorOrTest.cpp b/unittests/Support/ErrorOrTest.cpp index 7ace5e3e81..976a95379a 100644 --- a/unittests/Support/ErrorOrTest.cpp +++ b/unittests/Support/ErrorOrTest.cpp @@ -16,7 +16,7 @@ using namespace llvm; namespace { ErrorOr<int> t1() {return 1;} -ErrorOr<int> t2() { return errc::invalid_argument; } +ErrorOr<int> t2() { return std::errc::invalid_argument; } TEST(ErrorOr, SimpleValue) { ErrorOr<int> a = t1(); @@ -30,7 +30,7 @@ TEST(ErrorOr, SimpleValue) { a = t2(); EXPECT_FALSE(a); - EXPECT_EQ(errc::invalid_argument, a.getError()); + EXPECT_EQ(std::errc::invalid_argument, a.getError()); #ifdef EXPECT_DEBUG_DEATH EXPECT_DEBUG_DEATH(*a, "Cannot get value when an error exists"); #endif diff --git a/unittests/Support/Path.cpp b/unittests/Support/Path.cpp index 660ea3663a..d116acae2a 100644 --- a/unittests/Support/Path.cpp +++ b/unittests/Support/Path.cpp @@ -354,10 +354,10 @@ TEST_F(FileSystemTest, TempFiles) { ASSERT_NO_ERROR(fs::remove(Twine(TempPath2))); ASSERT_NO_ERROR(fs::remove(Twine(TempPath2))); ASSERT_EQ(fs::remove(Twine(TempPath2), false), - errc::no_such_file_or_directory); + std::errc::no_such_file_or_directory); error_code EC = fs::status(TempPath2.c_str(), B); - EXPECT_EQ(EC, errc::no_such_file_or_directory); + EXPECT_EQ(EC, std::errc::no_such_file_or_directory); EXPECT_EQ(B.type(), fs::file_type::file_not_found); // Make sure Temp2 doesn't exist. @@ -397,7 +397,7 @@ TEST_F(FileSystemTest, TempFiles) { "abcdefghijklmnopqrstuvwxyz3abcdefghijklmnopqrstuvwxyz2" "abcdefghijklmnopqrstuvwxyz1abcdefghijklmnopqrstuvwxyz0"; EXPECT_EQ(fs::createUniqueFile(Twine(Path270), FileDescriptor, TempPath), - error_code(ERROR_PATH_NOT_FOUND, system_category())); + std::errc::no_such_file_or_directory); #endif } @@ -405,7 +405,7 @@ TEST_F(FileSystemTest, CreateDir) { ASSERT_NO_ERROR(fs::create_directory(Twine(TestDirectory) + "foo")); ASSERT_NO_ERROR(fs::create_directory(Twine(TestDirectory) + "foo")); ASSERT_EQ(fs::create_directory(Twine(TestDirectory) + "foo", false), - errc::file_exists); + std::errc::file_exists); ASSERT_NO_ERROR(fs::remove(Twine(TestDirectory) + "foo")); } diff --git a/unittests/Transforms/DebugIR/DebugIR.cpp b/unittests/Transforms/DebugIR/DebugIR.cpp index 49ea09f7c6..5860e31b9d 100644 --- a/unittests/Transforms/DebugIR/DebugIR.cpp +++ b/unittests/Transforms/DebugIR/DebugIR.cpp @@ -58,7 +58,7 @@ bool removeIfExists(StringRef Path) { // This is an approximation, on error we don't know in general if the file // existed or not. llvm::error_code EC = sys::fs::remove(Path, false); - return EC != llvm::errc::no_such_file_or_directory; + return EC != std::errc::no_such_file_or_directory; } char * current_dir() { |