projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[X86] Add support for tbyte memory operand size for Intel-syntax x86 assembly
[oota-llvm.git]
/
lib
/
ProfileData
/
InstrProf.cpp
diff --git
a/lib/ProfileData/InstrProf.cpp
b/lib/ProfileData/InstrProf.cpp
index de2b13dafd028e44d24899ce145820294d3c2d70..92822a71402fc8d4eca92d71e3c26fc1aea8d14a 100644
(file)
--- a/
lib/ProfileData/InstrProf.cpp
+++ b/
lib/ProfileData/InstrProf.cpp
@@
-14,27
+14,28
@@
#include "llvm/ProfileData/InstrProf.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/ProfileData/InstrProf.h"
#include "llvm/Support/ErrorHandling.h"
+#include "llvm/Support/ManagedStatic.h"
using namespace llvm;
namespace {
using namespace llvm;
namespace {
-class InstrProfErrorCategoryType : public error_category {
- const char *name() const override { return "llvm.instrprof"; }
+class InstrProfErrorCategoryType : public
std::
error_category {
+ const char *name() const
LLVM_NOEXCEPT
override { return "llvm.instrprof"; }
std::string message(int IE) const override {
std::string message(int IE) const override {
- instrprof_error
::ErrorType E = static_cast<instrprof_error::ErrorType
>(IE);
+ instrprof_error
E = static_cast<instrprof_error
>(IE);
switch (E) {
case instrprof_error::success:
return "Success";
case instrprof_error::eof:
return "End of File";
case instrprof_error::bad_magic:
switch (E) {
case instrprof_error::success:
return "Success";
case instrprof_error::eof:
return "End of File";
case instrprof_error::bad_magic:
- return "Invalid
file format
(bad magic)";
+ return "Invalid
profile data
(bad magic)";
case instrprof_error::bad_header:
case instrprof_error::bad_header:
- return "Invalid
header
";
+ return "Invalid
profile data (file header is corrupt)
";
case instrprof_error::unsupported_version:
case instrprof_error::unsupported_version:
- return "Unsupported format version";
+ return "Unsupported
profiling
format version";
case instrprof_error::unsupported_hash_type:
case instrprof_error::unsupported_hash_type:
- return "Unsupported
hash function
";
+ return "Unsupported
profiling hash
";
case instrprof_error::too_large:
return "Too much profile data";
case instrprof_error::truncated:
case instrprof_error::too_large:
return "Too much profile data";
case instrprof_error::truncated:
@@
-52,15
+53,11
@@
class InstrProfErrorCategoryType : public error_category {
}
llvm_unreachable("A value of instrprof_error has no message.");
}
}
llvm_unreachable("A value of instrprof_error has no message.");
}
- error_condition default_error_condition(int EV) const override {
- if (EV == instrprof_error::success)
- return errc::success;
- return errc::invalid_argument;
- }
};
}
};
}
-const error_category &llvm::instrprof_category() {
- static InstrProfErrorCategoryType C;
- return C;
+static ManagedStatic<InstrProfErrorCategoryType> ErrorCategory;
+
+const std::error_category &llvm::instrprof_category() {
+ return *ErrorCategory;
}
}