Skip to content

[Core] Mark cms::Exception and edm::Exception functions that throw exceptions as noreturn #46388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmsbuild merged 3 commits into from
Oct 18, 2024
Merged

[Core] Mark cms::Exception and edm::Exception functions that throw exceptions as noreturn #46388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72a24e2
[Core] Mark cms::Exception and edm::Exception functions that throw ex…
iarspider Oct 15, 2024
1637e96
Update Exception.h
iarspider Oct 15, 2024
17fb372
Update ExceptionCollector.h
iarspider Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions FWCore/Utilities/interface/EDMException.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_;
Expand Down
2 changes: 1 addition & 1 deletion FWCore/Utilities/interface/Exception.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down