RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-29 22:30:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Try to fix ODR violation of ErrorInfo::ID

Browse Source 
This implements my suggestion to Lang.

llvm-svn: 264360
This commit is contained in:
Reid Kleckner 2016-03-24 23:49:34 +00:00
parent abf6fcb013
commit 57ae7f9db2
4 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/ProgrammersManual.rst
View File

@ -342,10 +342,13 @@ that inherits from the ErrorInfo utility:
public:
MyError(std::string Msg) : Msg(Msg) {}
void log(OStream &OS) const override { OS << "MyError - " << Msg; }
static char ID;
private:
std::string Msg;
};
char MyError::ID = 0; // In MyError.cpp
Error bar() {
if (checkErrorCondition)
return make_error<MyError>("Error condition detected");

14
include/llvm/Support/Error.h
View File

@ -285,15 +285,9 @@ public:
return ClassID == classID() || ParentErrT::isA(ClassID);
}
static const void *classID() { return &ID; }
private:
static char ID;
static const void *classID() { return &ThisErrT::ID; }
};
template <typename ThisErrT, typename ParentErrT>
char ErrorInfo<ThisErrT, ParentErrT>::ID = 0;
/// Special ErrorInfo subclass representing a list of ErrorInfos.
/// Instances of this class are constructed by joinError.
class ErrorList final : public ErrorInfo<ErrorList> {
@ -317,6 +311,9 @@ public:
std::error_code convertToErrorCode() const override;
// Used by ErrorInfo::classID.
static char ID;
private:
ErrorList(std::unique_ptr<ErrorInfoBase> Payload1,
std::unique_ptr<ErrorInfoBase> Payload2) {
@ -729,6 +726,9 @@ public:
std::error_code convertToErrorCode() const override { return EC; }
void log(raw_ostream &OS) const override { OS << EC.message(); }
// Used by ErrorInfo::classID.
static char ID;
protected:
std::error_code EC;
};

5
lib/Support/Error.cpp
View File

@ -36,9 +36,8 @@ namespace {
void ErrorInfoBase::anchor() {}
char ErrorInfoBase::ID = 0;
template <> char ErrorInfo<ErrorList>::ID = 0;
template <> char ErrorInfo<ECError>::ID = 0;
char ErrorList::ID = 0;
char ECError::ID = 0;
static ManagedStatic<ErrorErrorCategory> ErrorErrorCat;

13
unittests/Support/ErrorTest.cpp
View File

@ -35,6 +35,9 @@ public:
llvm_unreachable("CustomError doesn't support ECError conversion");
}
// Used by ErrorInfo::classID.
static char ID;
protected:
// This error is subclassed below, but we can't use inheriting constructors
// yet, so we can't propagate the constructors through ErrorInfo. Instead
@ -45,6 +48,8 @@ protected:
int Info;
};
char CustomError::ID = 0;
// Custom error class with a custom base class and some additional random
// 'info'.
class CustomSubError : public ErrorInfo<CustomSubError, CustomError> {
@ -66,10 +71,15 @@ public:
llvm_unreachable("CustomSubError doesn't support ECError conversion");
}
// Used by ErrorInfo::classID.
static char ID;
protected:
int ExtraInfo;
};
char CustomSubError::ID = 0;
static Error handleCustomError(const CustomError &CE) { return Error(); }
static void handleCustomErrorVoid(const CustomError &CE) {}
@ -453,6 +463,3 @@ TEST(Error, ErrorCodeConversions) {
}
} // end anon namespace
template <> char ErrorInfo<CustomError>::ID = 0;
template <> char ErrorInfo<CustomSubError, CustomError>::ID = 0;