Mark a few functions noexcept.

This reduces the difference between std::error_code and llvm::error_code.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210591 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Support/system_error.h b/include/llvm/Support/system_error.h
index 104cbc42e56539e19d6437aaf8a9ad3645f74bc5..724e3cef92f3aad714017d37eebc46c77b15b4b1 100644 (file)
--- a/include/llvm/Support/system_error.h
+++ b/include/llvm/Support/system_error.h
@@ -624,10 +624,12 @@ private:
   error_category& operator=(const error_category&) LLVM_DELETED_FUNCTION;
 
 public:
   error_category& operator=(const error_category&) LLVM_DELETED_FUNCTION;
 
 public:

-  virtual const char* name() const = 0;
-  virtual error_condition default_error_condition(int _ev) const;
-  virtual bool equivalent(int _code, const error_condition& _condition) const;
-  virtual bool equivalent(const error_code& _code, int _condition) const;
+  virtual const char* name() const LLVM_NOEXCEPT = 0;
+  virtual error_condition default_error_condition(int _ev) const LLVM_NOEXCEPT;
+  virtual bool
+  equivalent(int _code, const error_condition &_condition) const LLVM_NOEXCEPT;
+  virtual bool equivalent(const error_code &_code,
+                          int _condition) const LLVM_NOEXCEPT;

   virtual std::string message(int _ev) const = 0;
 
   bool operator==(const error_category& _rhs) const {return this == &_rhs;}
   virtual std::string message(int _ev) const = 0;
 
   bool operator==(const error_category& _rhs) const {return this == &_rhs;}

diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp
index 96381175bd743899f9b104026b856cb1ec2b9fa3..849c548e0bc448c5c4d05a7125055a8215d1f32b 100644 (file)
--- a/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -3301,7 +3301,7 @@ error_code BitcodeReader::InitLazyStream() {
 
 namespace {
 class BitcodeErrorCategoryType : public error_category {
 
 namespace {
 class BitcodeErrorCategoryType : public error_category {

-  const char *name() const override {
+  const char *name() const LLVM_NOEXCEPT override {

     return "llvm.bitcode";
   }
   std::string message(int IE) const override {
     return "llvm.bitcode";
   }
   std::string message(int IE) const override {

diff --git a/lib/Object/Error.cpp b/lib/Object/Error.cpp
index f1d0f0184d242c2f786b4c910899627954ddb174..6bcc6f9a78190251c13d54f6ca595cf6bb56bf11 100644 (file)
--- a/lib/Object/Error.cpp
+++ b/lib/Object/Error.cpp
@@ -20,9 +20,9 @@ using namespace object;
 namespace {
 class _object_error_category : public error_category {
 public:
 namespace {
 class _object_error_category : public error_category {
 public:

-  const char* name() const override;
+  const char* name() const LLVM_NOEXCEPT override;

   std::string message(int ev) const override;
   std::string message(int ev) const override;

-  error_condition default_error_condition(int ev) const override;
+  error_condition default_error_condition(int ev) const LLVM_NOEXCEPT override;

 };
 }
 
 };
 }
 

diff --git a/lib/ProfileData/InstrProf.cpp b/lib/ProfileData/InstrProf.cpp
index a6583130ee7451ae4a5a1fcdfefa96fd166971ec..94a79e9ed0300fde1854ae490c31ff31b7428524 100644 (file)
--- a/lib/ProfileData/InstrProf.cpp
+++ b/lib/ProfileData/InstrProf.cpp
@@ -19,7 +19,7 @@ using namespace llvm;
 
 namespace {
 class InstrProfErrorCategoryType : public error_category {
 
 namespace {
 class InstrProfErrorCategoryType : public error_category {

-  const char *name() const override { return "llvm.instrprof"; }
+  const char *name() const LLVM_NOEXCEPT override { return "llvm.instrprof"; }

   std::string message(int IE) const override {
     instrprof_error E = static_cast<instrprof_error>(IE);
     switch (E) {
   std::string message(int IE) const override {
     instrprof_error E = static_cast<instrprof_error>(IE);
     switch (E) {


@@ -52,7 +52,7 @@ 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 {
+  error_condition default_error_condition(int EV) const LLVM_NOEXCEPT override {

     if (static_cast<instrprof_error>(EV) == instrprof_error::success)
       return error_condition();
     return errc::invalid_argument;
     if (static_cast<instrprof_error>(EV) == instrprof_error::success)
       return error_condition();
     return errc::invalid_argument;

diff --git a/lib/Support/system_error.cpp b/lib/Support/system_error.cpp
index 299f54abb15cd110e7b159661c0bfb0749d6d904..0ca183e40a4e9f96c086fa3aa1e802a7589502ba 100644 (file)
--- a/lib/Support/system_error.cpp
+++ b/lib/Support/system_error.cpp
@@ -48,7 +48,7 @@ _do_message::message(int ev) const {
 
 class _generic_error_category : public _do_message {
 public:
 
 class _generic_error_category : public _do_message {
 public:

-  const char* name() const override;
+  const char* name() const LLVM_NOEXCEPT override;

   std::string message(int ev) const override;
 };
 
   std::string message(int ev) const override;
 };
 


@@ -74,7 +74,7 @@ generic_category() {
 
 class _system_error_category : public _do_message {
 public:
 
 class _system_error_category : public _do_message {
 public:

-  const char* name() const override;
+  const char* name() const LLVM_NOEXCEPT override;

   std::string message(int ev) const override;
   error_condition default_error_condition(int ev) const override;
 };
   std::string message(int ev) const override;
   error_condition default_error_condition(int ev) const override;
 };

diff --git a/tools/llvm-readobj/Error.cpp b/tools/llvm-readobj/Error.cpp
index 75c392e0f9fe01ea984d72c664f297664a257877..424dfbea06b9265d248591382fe557e999a11ff2 100644 (file)
--- a/tools/llvm-readobj/Error.cpp
+++ b/tools/llvm-readobj/Error.cpp
@@ -19,9 +19,9 @@ using namespace llvm;
 namespace {
 class _readobj_error_category : public error_category {
 public:
 namespace {
 class _readobj_error_category : public error_category {
 public:

-  const char* name() const override;
+  const char* name() const LLVM_NOEXCEPT override;

   std::string message(int ev) const override;
   std::string message(int ev) const override;

-  error_condition default_error_condition(int ev) const override;
+  error_condition default_error_condition(int ev) const LLVM_NOEXCEPT override;

 };
 } // namespace
 
 };
 } // namespace
 

diff --git a/tools/obj2yaml/Error.cpp b/tools/obj2yaml/Error.cpp
index 0003b7bb8d539336bcd3dfb85d5ac8af2052eaea..7f25d745e1cb5a8c5107108974dd0b9687d9fc86 100644 (file)
--- a/tools/obj2yaml/Error.cpp
+++ b/tools/obj2yaml/Error.cpp
@@ -15,9 +15,9 @@ using namespace llvm;
 namespace {
 class _obj2yaml_error_category : public error_category {
 public:
 namespace {
 class _obj2yaml_error_category : public error_category {
 public:

-  const char *name() const override;
+  const char *name() const LLVM_NOEXCEPT override;

   std::string message(int ev) const override;
   std::string message(int ev) const override;

-  error_condition default_error_condition(int ev) const override;
+  error_condition default_error_condition(int ev) const LLVM_NOEXCEPT override;

 };
 } // namespace
 
 };
 } // namespace