maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[Support][ErrorOr] Add support for implicit conversion from error code/condition enums. 

llvm-svn: 176228
This commit is contained in:
Michael J. Spencer 2013-02-28 01:44:26 +00:00
parent 397ef40f6b
commit 12e3dfc58e
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
llvm/include/llvm/Support/ErrorOr.h
View File

@ -180,6 +180,16 @@ private:
public: public:
ErrorOr() : IsValid(false) {} ErrorOr() : IsValid(false) {}
template <class E>
ErrorOr(E ErrorCode, typename enable_if_c<is_error_code_enum<E>::value ||
is_error_condition_enum<E>::value,
void *>::type = 0)
: HasError(true), IsValid(true) {
Error = new ErrorHolderBase;
Error->Error = make_error_code(ErrorCode);
Error->HasUserData = false;
}
ErrorOr(llvm::error_code EC) : HasError(true), IsValid(true) { ErrorOr(llvm::error_code EC) : HasError(true), IsValid(true) {
Error = new ErrorHolderBase; Error = new ErrorHolderBase;
Error->Error = EC; Error->Error = EC;
@ -387,6 +397,22 @@ class ErrorOr<void> {
public: public:
ErrorOr() : Error(0, 0) {} ErrorOr() : Error(0, 0) {}
template <class E>
ErrorOr(E ErrorCode, typename enable_if_c<is_error_code_enum<E>::value ||
is_error_condition_enum<E>::value,
void *> ::type = 0)
: Error(0, 0) {
error_code EC = make_error_code(ErrorCode);
if (EC == errc::success) {
Error.setInt(1);
return;
}
ErrorHolderBase *EHB = new ErrorHolderBase;
EHB->Error = EC;
EHB->HasUserData = false;
Error.setPointer(EHB);
}
ErrorOr(llvm::error_code EC) : Error(0, 0) { ErrorOr(llvm::error_code EC) : Error(0, 0) {
if (EC == errc::success) { if (EC == errc::success) {
Error.setInt(1); Error.setInt(1);

6
llvm/unittests/Support/ErrorOrTest.cpp
View File

@ -18,7 +18,7 @@ using namespace llvm;
namespace { namespace {
ErrorOr<int> t1() {return 1;} ErrorOr<int> t1() {return 1;}
ErrorOr<int> t2() {return make_error_code(errc::invalid_argument);} ErrorOr<int> t2() { return errc::invalid_argument; }
TEST(ErrorOr, SimpleValue) { TEST(ErrorOr, SimpleValue) {
ErrorOr<int> a = t1(); ErrorOr<int> a = t1();
@ -45,8 +45,8 @@ TEST(ErrorOr, Types) {
*a = 42; *a = 42;
EXPECT_EQ(42, x); EXPECT_EQ(42, x);
EXPECT_FALSE(ErrorOr<void>(make_error_code(errc::broken_pipe))); EXPECT_FALSE(ErrorOr<void>(errc::broken_pipe));
EXPECT_TRUE(ErrorOr<void>(make_error_code(errc::success))); EXPECT_TRUE(ErrorOr<void>(errc::success));
#if LLVM_HAS_CXX11_STDLIB #if LLVM_HAS_CXX11_STDLIB
// Move only types. // Move only types.