Merge pull request #46388 from iarspider/iarspider-patches-20241015-1

[Core] Mark cms::Exception and edm::Exception functions that throw exceptions as noreturn
cms-sw · Oct 18, 2024 · 2f9b38f · 2f9b38f
2 parents 4694d77 + 17fb372
commit 2f9b38f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/FWCore/Utilities/interface/EDMException.h b/FWCore/Utilities/interface/EDMException.h
@@ -103,18 +103,18 @@ namespace edm {
 
     static const std::string& codeToString(Code);
 
-    static void throwThis(Code category,
-                          char const* message0 = "",
-                          char const* message1 = "",
-                          char const* message2 = "",
-                          char const* message3 = "",
-                          char const* message4 = "");
-    static void throwThis(Code category, char const* message0, int intVal, char const* message2 = "");
+    [[noreturn]] static void throwThis(Code category,
+                                       char const* message0 = "",
+                                       char const* message1 = "",
+                                       char const* message2 = "",
+                                       char const* message3 = "",
+                                       char const* message4 = "");
+    [[noreturn]] static void throwThis(Code category, char const* message0, int intVal, char const* message2 = "");
 
     Exception* clone() const override;
 
   private:
-    void rethrow() override;
+    [[noreturn]] void rethrow() override;
     int returnCode_() const override;
 
     Code category_;

diff --git a/FWCore/Utilities/interface/Exception.h b/FWCore/Utilities/interface/Exception.h
@@ -132,7 +132,7 @@ namespace cms {
 
   private:
     void init(std::string const& message);
-    virtual void rethrow();
+    [[noreturn]] virtual void rethrow();
     virtual int returnCode_() const;
 
     // data members