From 5b1c9f322337025957a7100d4bf38cfa93d9f549 Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Wed, 19 Oct 2016 23:52:38 +0000 Subject: [PATCH] Remove LLVM_NOEXCEPT and replace it with noexcept Now that we have dropped MSVC 2013, all supported compilers support noexcept and we can drop this portability macro. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@284672 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/MC/MCContext.h | 9 ++++----- include/llvm/Support/Compiler.h | 6 ------ include/llvm/Support/YAMLParser.h | 6 +++--- lib/Bitcode/Reader/BitcodeReader.cpp | 2 +- lib/DebugInfo/CodeView/CodeViewError.cpp | 2 +- lib/DebugInfo/MSF/MSFError.cpp | 2 +- lib/DebugInfo/PDB/DIA/DIAError.cpp | 2 +- lib/DebugInfo/PDB/GenericError.cpp | 2 +- lib/DebugInfo/PDB/Raw/RawError.cpp | 2 +- lib/ExecutionEngine/Orc/OrcError.cpp | 2 +- lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp | 2 +- lib/Object/Error.cpp | 4 ++-- lib/ProfileData/Coverage/CoverageMapping.cpp | 2 +- lib/ProfileData/InstrProf.cpp | 2 +- lib/ProfileData/SampleProf.cpp | 2 +- lib/Support/Error.cpp | 2 +- tools/llvm-cxxdump/Error.cpp | 2 +- tools/llvm-readobj/Error.cpp | 4 ++-- tools/obj2yaml/Error.cpp | 4 ++-- 19 files changed, 26 insertions(+), 33 deletions(-) diff --git a/include/llvm/MC/MCContext.h b/include/llvm/MC/MCContext.h index 6f6cd96af56..e637afb9871 100644 --- a/include/llvm/MC/MCContext.h +++ b/include/llvm/MC/MCContext.h @@ -578,7 +578,7 @@ namespace llvm { /// allocator supports it). /// \return The allocated memory. Could be NULL. inline void *operator new(size_t Bytes, llvm::MCContext &C, - size_t Alignment = 8) LLVM_NOEXCEPT { + size_t Alignment = 8) noexcept { return C.allocate(Bytes, Alignment); } /// \brief Placement delete companion to the new above. @@ -587,8 +587,7 @@ inline void *operator new(size_t Bytes, llvm::MCContext &C, /// invoking it directly; see the new operator for more details. This operator /// is called implicitly by the compiler if a placement new expression using /// the MCContext throws in the object constructor. -inline void operator delete(void *Ptr, llvm::MCContext &C, - size_t) LLVM_NOEXCEPT { +inline void operator delete(void *Ptr, llvm::MCContext &C, size_t) noexcept { C.deallocate(Ptr); } @@ -612,7 +611,7 @@ inline void operator delete(void *Ptr, llvm::MCContext &C, /// allocator supports it). /// \return The allocated memory. Could be NULL. inline void *operator new[](size_t Bytes, llvm::MCContext &C, - size_t Alignment = 8) LLVM_NOEXCEPT { + size_t Alignment = 8) noexcept { return C.allocate(Bytes, Alignment); } @@ -622,7 +621,7 @@ inline void *operator new[](size_t Bytes, llvm::MCContext &C, /// invoking it directly; see the new[] operator for more details. This operator /// is called implicitly by the compiler if a placement new[] expression using /// the MCContext throws in the object constructor. -inline void operator delete[](void *Ptr, llvm::MCContext &C) LLVM_NOEXCEPT { +inline void operator delete[](void *Ptr, llvm::MCContext &C) noexcept { C.deallocate(Ptr); } diff --git a/include/llvm/Support/Compiler.h b/include/llvm/Support/Compiler.h index 33a0399261e..a132dca62aa 100644 --- a/include/llvm/Support/Compiler.h +++ b/include/llvm/Support/Compiler.h @@ -73,12 +73,6 @@ #define LLVM_MSC_PREREQ(version) 0 #endif -#if !defined(_MSC_VER) || defined(__clang__) || LLVM_MSC_PREREQ(1900) -#define LLVM_NOEXCEPT noexcept -#else -#define LLVM_NOEXCEPT throw() -#endif - /// \brief Does the compiler support ref-qualifiers for *this? /// /// Sadly, this is separate from just rvalue reference support because GCC diff --git a/include/llvm/Support/YAMLParser.h b/include/llvm/Support/YAMLParser.h index 23014fc10a3..dad6740ee06 100644 --- a/include/llvm/Support/YAMLParser.h +++ b/include/llvm/Support/YAMLParser.h @@ -144,12 +144,12 @@ public: unsigned int getType() const { return TypeID; } void *operator new(size_t Size, BumpPtrAllocator &Alloc, - size_t Alignment = 16) LLVM_NOEXCEPT { + size_t Alignment = 16) noexcept { return Alloc.Allocate(Size, Alignment); } void operator delete(void *Ptr, BumpPtrAllocator &Alloc, - size_t Size) LLVM_NOEXCEPT { + size_t Size) noexcept { Alloc.Deallocate(Ptr, Size); } @@ -157,7 +157,7 @@ protected: std::unique_ptr &Doc; SMRange SourceRange; - void operator delete(void *) LLVM_NOEXCEPT = delete; + void operator delete(void *) noexcept = delete; ~Node() = default; diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp index 09118ea4c3a..825df2b535d 100644 --- a/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/lib/Bitcode/Reader/BitcodeReader.cpp @@ -6581,7 +6581,7 @@ namespace { // will be removed once this transition is complete. Clients should prefer to // deal with the Error value directly, rather than converting to error_code. class BitcodeErrorCategoryType : public std::error_category { - const char *name() const LLVM_NOEXCEPT override { + const char *name() const noexcept override { return "llvm.bitcode"; } std::string message(int IE) const override { diff --git a/lib/DebugInfo/CodeView/CodeViewError.cpp b/lib/DebugInfo/CodeView/CodeViewError.cpp index e9678db7a5b..55c10c076ee 100644 --- a/lib/DebugInfo/CodeView/CodeViewError.cpp +++ b/lib/DebugInfo/CodeView/CodeViewError.cpp @@ -20,7 +20,7 @@ namespace { // deal with the Error value directly, rather than converting to error_code. class CodeViewErrorCategory : public std::error_category { public: - const char *name() const LLVM_NOEXCEPT override { return "llvm.codeview"; } + const char *name() const noexcept override { return "llvm.codeview"; } std::string message(int Condition) const override { switch (static_cast(Condition)) { diff --git a/lib/DebugInfo/MSF/MSFError.cpp b/lib/DebugInfo/MSF/MSFError.cpp index 5272cad3890..1b8294e47e7 100644 --- a/lib/DebugInfo/MSF/MSFError.cpp +++ b/lib/DebugInfo/MSF/MSFError.cpp @@ -20,7 +20,7 @@ namespace { // deal with the Error value directly, rather than converting to error_code. class MSFErrorCategory : public std::error_category { public: - const char *name() const LLVM_NOEXCEPT override { return "llvm.msf"; } + const char *name() const noexcept override { return "llvm.msf"; } std::string message(int Condition) const override { switch (static_cast(Condition)) { diff --git a/lib/DebugInfo/PDB/DIA/DIAError.cpp b/lib/DebugInfo/PDB/DIA/DIAError.cpp index 81125d267f4..0da877b0fba 100644 --- a/lib/DebugInfo/PDB/DIA/DIAError.cpp +++ b/lib/DebugInfo/PDB/DIA/DIAError.cpp @@ -10,7 +10,7 @@ using namespace llvm::pdb; // deal with the Error value directly, rather than converting to error_code. class DIAErrorCategory : public std::error_category { public: - const char *name() const LLVM_NOEXCEPT override { return "llvm.pdb.dia"; } + const char *name() const noexcept override { return "llvm.pdb.dia"; } std::string message(int Condition) const override { switch (static_cast(Condition)) { diff --git a/lib/DebugInfo/PDB/GenericError.cpp b/lib/DebugInfo/PDB/GenericError.cpp index 43210139bb6..789f3b81317 100644 --- a/lib/DebugInfo/PDB/GenericError.cpp +++ b/lib/DebugInfo/PDB/GenericError.cpp @@ -20,7 +20,7 @@ namespace { // deal with the Error value directly, rather than converting to error_code. class GenericErrorCategory : public std::error_category { public: - const char *name() const LLVM_NOEXCEPT override { return "llvm.pdb"; } + const char *name() const noexcept override { return "llvm.pdb"; } std::string message(int Condition) const override { switch (static_cast(Condition)) { diff --git a/lib/DebugInfo/PDB/Raw/RawError.cpp b/lib/DebugInfo/PDB/Raw/RawError.cpp index cbce890f6ce..f4a5057509e 100644 --- a/lib/DebugInfo/PDB/Raw/RawError.cpp +++ b/lib/DebugInfo/PDB/Raw/RawError.cpp @@ -11,7 +11,7 @@ namespace { // deal with the Error value directly, rather than converting to error_code. class RawErrorCategory : public std::error_category { public: - const char *name() const LLVM_NOEXCEPT override { return "llvm.pdb.raw"; } + const char *name() const noexcept override { return "llvm.pdb.raw"; } std::string message(int Condition) const override { switch (static_cast(Condition)) { diff --git a/lib/ExecutionEngine/Orc/OrcError.cpp b/lib/ExecutionEngine/Orc/OrcError.cpp index 22f1303f433..64472f9ba37 100644 --- a/lib/ExecutionEngine/Orc/OrcError.cpp +++ b/lib/ExecutionEngine/Orc/OrcError.cpp @@ -25,7 +25,7 @@ namespace { // deal with the Error value directly, rather than converting to error_code. class OrcErrorCategory : public std::error_category { public: - const char *name() const LLVM_NOEXCEPT override { return "orc"; } + const char *name() const noexcept override { return "orc"; } std::string message(int condition) const override { switch (static_cast(condition)) { diff --git a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp index 0c69b1a5160..82b582a8425 100644 --- a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp +++ b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp @@ -39,7 +39,7 @@ enum RuntimeDyldErrorCode { // deal with the Error value directly, rather than converting to error_code. class RuntimeDyldErrorCategory : public std::error_category { public: - const char *name() const LLVM_NOEXCEPT override { return "runtimedyld"; } + const char *name() const noexcept override { return "runtimedyld"; } std::string message(int Condition) const override { switch (static_cast(Condition)) { diff --git a/lib/Object/Error.cpp b/lib/Object/Error.cpp index 2357526b789..c1dfe673b61 100644 --- a/lib/Object/Error.cpp +++ b/lib/Object/Error.cpp @@ -24,12 +24,12 @@ namespace { // deal with the Error value directly, rather than converting to error_code. class _object_error_category : public std::error_category { public: - const char* name() const LLVM_NOEXCEPT override; + const char* name() const noexcept override; std::string message(int ev) const override; }; } -const char *_object_error_category::name() const LLVM_NOEXCEPT { +const char *_object_error_category::name() const noexcept { return "llvm.object"; } diff --git a/lib/ProfileData/Coverage/CoverageMapping.cpp b/lib/ProfileData/Coverage/CoverageMapping.cpp index 2d800a3592b..6d907c7098e 100644 --- a/lib/ProfileData/Coverage/CoverageMapping.cpp +++ b/lib/ProfileData/Coverage/CoverageMapping.cpp @@ -589,7 +589,7 @@ std::string getCoverageMapErrString(coveragemap_error Err) { // will be removed once this transition is complete. Clients should prefer to // deal with the Error value directly, rather than converting to error_code. class CoverageMappingErrorCategoryType : public std::error_category { - const char *name() const LLVM_NOEXCEPT override { return "llvm.coveragemap"; } + const char *name() const noexcept override { return "llvm.coveragemap"; } std::string message(int IE) const override { return getCoverageMapErrString(static_cast(IE)); } diff --git a/lib/ProfileData/InstrProf.cpp b/lib/ProfileData/InstrProf.cpp index b512f543e95..77c6ffc9c25 100644 --- a/lib/ProfileData/InstrProf.cpp +++ b/lib/ProfileData/InstrProf.cpp @@ -80,7 +80,7 @@ std::string getInstrProfErrString(instrprof_error Err) { // will be removed once this transition is complete. Clients should prefer to // deal with the Error value directly, rather than converting to error_code. class InstrProfErrorCategoryType : public std::error_category { - const char *name() const LLVM_NOEXCEPT override { return "llvm.instrprof"; } + const char *name() const noexcept override { return "llvm.instrprof"; } std::string message(int IE) const override { return getInstrProfErrString(static_cast(IE)); } diff --git a/lib/ProfileData/SampleProf.cpp b/lib/ProfileData/SampleProf.cpp index cb0246113d8..5bcfff0801d 100644 --- a/lib/ProfileData/SampleProf.cpp +++ b/lib/ProfileData/SampleProf.cpp @@ -24,7 +24,7 @@ namespace { // will be removed once this transition is complete. Clients should prefer to // deal with the Error value directly, rather than converting to error_code. class SampleProfErrorCategoryType : public std::error_category { - const char *name() const LLVM_NOEXCEPT override { return "llvm.sampleprof"; } + const char *name() const noexcept override { return "llvm.sampleprof"; } std::string message(int IE) const override { sampleprof_error E = static_cast(IE); switch (E) { diff --git a/lib/Support/Error.cpp b/lib/Support/Error.cpp index 28d9127777f..7436a1fd38e 100644 --- a/lib/Support/Error.cpp +++ b/lib/Support/Error.cpp @@ -28,7 +28,7 @@ namespace { // deal with the Error value directly, rather than converting to error_code. class ErrorErrorCategory : public std::error_category { public: - const char *name() const LLVM_NOEXCEPT override { return "Error"; } + const char *name() const noexcept override { return "Error"; } std::string message(int condition) const override { switch (static_cast(condition)) { diff --git a/tools/llvm-cxxdump/Error.cpp b/tools/llvm-cxxdump/Error.cpp index ff9f0f57906..d59547e3a2c 100644 --- a/tools/llvm-cxxdump/Error.cpp +++ b/tools/llvm-cxxdump/Error.cpp @@ -22,7 +22,7 @@ namespace { // deal with the Error value directly, rather than converting to error_code. class cxxdump_error_category : public std::error_category { public: - const char *name() const LLVM_NOEXCEPT override { return "llvm.cxxdump"; } + const char *name() const noexcept override { return "llvm.cxxdump"; } std::string message(int ev) const override { switch (static_cast(ev)) { case cxxdump_error::success: diff --git a/tools/llvm-readobj/Error.cpp b/tools/llvm-readobj/Error.cpp index 492eb330949..03d349440e6 100644 --- a/tools/llvm-readobj/Error.cpp +++ b/tools/llvm-readobj/Error.cpp @@ -22,12 +22,12 @@ namespace { // deal with the Error value directly, rather than converting to error_code. class _readobj_error_category : public std::error_category { public: - const char* name() const LLVM_NOEXCEPT override; + const char* name() const noexcept override; std::string message(int ev) const override; }; } // namespace -const char *_readobj_error_category::name() const LLVM_NOEXCEPT { +const char *_readobj_error_category::name() const noexcept { return "llvm.readobj"; } diff --git a/tools/obj2yaml/Error.cpp b/tools/obj2yaml/Error.cpp index 9d1af680a73..399b563fd9c 100644 --- a/tools/obj2yaml/Error.cpp +++ b/tools/obj2yaml/Error.cpp @@ -18,12 +18,12 @@ namespace { // deal with the Error value directly, rather than converting to error_code. class _obj2yaml_error_category : public std::error_category { public: - const char *name() const LLVM_NOEXCEPT override; + const char *name() const noexcept override; std::string message(int ev) const override; }; } // namespace -const char *_obj2yaml_error_category::name() const LLVM_NOEXCEPT { +const char *_obj2yaml_error_category::name() const noexcept { return "obj2yaml"; }