diff --git a/llvm/include/llvm/MC/MCContext.h b/llvm/include/llvm/MC/MCContext.h index 41169e9a12a0..e33b802549c9 100644 --- a/llvm/include/llvm/MC/MCContext.h +++ b/llvm/include/llvm/MC/MCContext.h @@ -538,7 +538,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) throw() { + size_t Alignment = 8) LLVM_NOEXCEPT { return C.allocate(Bytes, Alignment); } /// \brief Placement delete companion to the new above. @@ -547,8 +547,8 @@ 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) - throw () { +inline void operator delete(void *Ptr, llvm::MCContext &C, + size_t) LLVM_NOEXCEPT { C.deallocate(Ptr); } @@ -571,8 +571,8 @@ inline void operator delete(void *Ptr, llvm::MCContext &C, size_t) /// \param Alignment The alignment of the allocated memory (if the underlying /// allocator supports it). /// \return The allocated memory. Could be NULL. -inline void *operator new[](size_t Bytes, llvm::MCContext& C, - size_t Alignment = 8) throw() { +inline void *operator new[](size_t Bytes, llvm::MCContext &C, + size_t Alignment = 8) LLVM_NOEXCEPT { return C.allocate(Bytes, Alignment); } @@ -582,7 +582,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) throw () { +inline void operator delete[](void *Ptr, llvm::MCContext &C) LLVM_NOEXCEPT { C.deallocate(Ptr); } diff --git a/llvm/include/llvm/Support/Compiler.h b/llvm/include/llvm/Support/Compiler.h index 141639839cc2..1c0ef75f5298 100644 --- a/llvm/include/llvm/Support/Compiler.h +++ b/llvm/include/llvm/Support/Compiler.h @@ -69,7 +69,7 @@ #if !defined(_MSC_VER) || defined(__clang__) || LLVM_MSC_PREREQ(1900) #define LLVM_NOEXCEPT noexcept #else -#define LLVM_NOEXCEPT +#define LLVM_NOEXCEPT throw() #endif /// \brief Does the compiler support ref-qualifiers for *this? diff --git a/llvm/include/llvm/Support/YAMLParser.h b/llvm/include/llvm/Support/YAMLParser.h index 0fbb7d2e6c7e..b02f2ace2158 100644 --- a/llvm/include/llvm/Support/YAMLParser.h +++ b/llvm/include/llvm/Support/YAMLParser.h @@ -145,11 +145,12 @@ public: unsigned int getType() const { return TypeID; } void *operator new(size_t Size, BumpPtrAllocator &Alloc, - size_t Alignment = 16) throw() { + size_t Alignment = 16) LLVM_NOEXCEPT { return Alloc.Allocate(Size, Alignment); } - void operator delete(void *Ptr, BumpPtrAllocator &Alloc, size_t Size) throw() { + void operator delete(void *Ptr, BumpPtrAllocator &Alloc, + size_t Size) LLVM_NOEXCEPT { Alloc.Deallocate(Ptr, Size); } @@ -157,7 +158,7 @@ protected: std::unique_ptr &Doc; SMRange SourceRange; - void operator delete(void *) throw() {} + void operator delete(void *) LLVM_NOEXCEPT {} ~Node() = default;