Skip to content

mars2grib: remove __builtin_unreachable() #173

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

Draft
tweska wants to merge 5 commits into
base: develop
Choose a base branch
from
Draft

mars2grib: remove __builtin_unreachable() #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
14dc3e8
Remove unnecessary unreachable calls and unused generalUtils includes
tweska Mar 2, 2026
3f5bf46
Refactor out remaining unreachable calls
tweska Mar 2, 2026
3275a6b
Run clang-format
tweska Mar 2, 2026
b78883e
Get rid of missing return warning with Intel compiler
tweska Mar 2, 2026
21cefcf
Run clang-format
tweska Mar 2, 2026
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
1 change: 0 additions & 1 deletion src/metkit/mars2grib/CoreOperations.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
/// @note: clang-format needs to be off here to preserve the logical grouping of
/// includes and avoid unnecessary reordering that breaks the layering and dependencies.
// clang-format off
#include "metkit/mars2grib/utils/generalUtils.h"
#include "metkit/mars2grib/utils/dictionary_traits/dictionary_access_traits.h"
#include "metkit/mars2grib/backend/concepts/GeneralRegistry.h"
#include "metkit/mars2grib/backend/encodeValues.h"
Expand Down
4 changes: 0 additions & 4 deletions src/metkit/mars2grib/backend/checks/checkDerivedProductDefinitionSection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include <string>

#include "eckit/log/Log.h"
#include "metkit/mars2grib/utils/generalUtils.h"

#include "metkit/config/LibMetkit.h"
#include "metkit/mars2grib/utils/enableOptions.h"
Expand Down Expand Up @@ -91,9 +90,6 @@ void check_DerivedProductDefinitionSection_or_throw(const OptDict_t& opt, const
std::throw_with_nested(
Mars2GribValidationException("Unable to validate Derived Product Definition Section", Here()));
};

// Remove compiler warning
mars2gribUnreachable();
};

} // namespace metkit::mars2grib::backend::validation
4 changes: 0 additions & 4 deletions src/metkit/mars2grib/backend/checks/checkDestinELocalSection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include <string>

#include "eckit/log/Log.h"
#include "metkit/mars2grib/utils/generalUtils.h"

#include "metkit/config/LibMetkit.h"
#include "metkit/mars2grib/utils/enableOptions.h"
Expand Down Expand Up @@ -100,9 +99,6 @@ void check_DestinELocalSection_or_throw(const OptDict_t& opt, const OutDict_t& o
// Rethrow nested exceptions
std::throw_with_nested(Mars2GribValidationException("Unable to validate DestinE Local Use Section", Here()));
};

// Remove compiler warning
mars2gribUnreachable();
};

} // namespace metkit::mars2grib::backend::validation
4 changes: 0 additions & 4 deletions src/metkit/mars2grib/backend/checks/checkEnsembleProductDefinitionSection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include <string>

#include "eckit/log/Log.h"
#include "metkit/mars2grib/utils/generalUtils.h"

#include "metkit/config/LibMetkit.h"
#include "metkit/mars2grib/utils/enableOptions.h"
Expand Down Expand Up @@ -93,9 +92,6 @@ void check_EnsembleProductDefinitionSection_or_throw(const OptDict_t& opt, const
std::throw_with_nested(
Mars2GribValidationException("Unable to validate Ensemble Product Definition Section", Here()));
};

// Remove compiler warning
mars2gribUnreachable();
};

} // namespace metkit::mars2grib::backend::validation
4 changes: 0 additions & 4 deletions src/metkit/mars2grib/backend/checks/checkLocalUseSection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include <string>

#include "eckit/log/Log.h"
#include "metkit/mars2grib/utils/generalUtils.h"

#include "metkit/config/LibMetkit.h"
#include "metkit/mars2grib/utils/enableOptions.h"
Expand Down Expand Up @@ -86,9 +85,6 @@ void check_LocalUseSection_or_throw(const OptDict_t& opt, const OutDict_t& out)
std::throw_with_nested(
Mars2GribValidationException("Unable to validate presence of Local Use Section", Here()));
};

// Remove compiler warning
mars2gribUnreachable();
};

} // namespace metkit::mars2grib::backend::validation
4 changes: 0 additions & 4 deletions src/metkit/mars2grib/backend/checks/checkStatisticsProductDefinitionSection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include <string>

#include "eckit/log/Log.h"
#include "metkit/mars2grib/utils/generalUtils.h"

#include "metkit/config/LibMetkit.h"
#include "metkit/mars2grib/utils/enableOptions.h"
Expand Down Expand Up @@ -90,9 +89,6 @@ void check_StatisticsProductDefinitionSection_or_throw(const OptDict_t& opt, con
std::throw_with_nested(
Mars2GribValidationException("Unable to validate Product Definition Section as Statistics type", Here()));
};

// Remove compiler warning
mars2gribUnreachable();
};

} // namespace metkit::mars2grib::backend::validation
4 changes: 0 additions & 4 deletions src/metkit/mars2grib/backend/checks/matchDataRepresentationTemplateNumber.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include <vector>

#include "eckit/log/Log.h"
#include "metkit/mars2grib/utils/generalUtils.h"

#include "metkit/config/LibMetkit.h"
#include "metkit/mars2grib/utils/enableOptions.h"
Expand Down Expand Up @@ -105,9 +104,6 @@ void match_DataRepresentationTemplateNumber_or_throw(
std::throw_with_nested(
Mars2GribValidationException("Unable to validate Data Representation Template Number", Here()));
};

// Remove compiler warning
mars2gribUnreachable();
};

} // namespace metkit::mars2grib::backend::validation
4 changes: 0 additions & 4 deletions src/metkit/mars2grib/backend/checks/matchDataset.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include <string>

#include "eckit/log/Log.h"
#include "metkit/mars2grib/utils/generalUtils.h"

#include "metkit/config/LibMetkit.h"
#include "metkit/mars2grib/utils/enableOptions.h"
Expand Down Expand Up @@ -89,9 +88,6 @@ void match_Dataset_or_throw(const OptDict_t& opt, const OutDict_t& out, const st
// Rethrow nested exceptions
std::throw_with_nested(Mars2GribValidationException("Unable to validate dataset from the sample", Here()));
};

// Remove compiler warning
mars2gribUnreachable();
};

} // namespace metkit::mars2grib::backend::validation
4 changes: 0 additions & 4 deletions src/metkit/mars2grib/backend/checks/matchGridDefinitionTemplateNumber.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include <vector>

#include "eckit/log/Log.h"
#include "metkit/mars2grib/utils/generalUtils.h"

#include "metkit/config/LibMetkit.h"
#include "metkit/mars2grib/utils/enableOptions.h"
Expand Down Expand Up @@ -104,9 +103,6 @@ void match_GridDefinitionTemplateNumber_or_throw(const OptDict_t& opt, const Out
std::throw_with_nested(
Mars2GribValidationException("Unable to validate Grid Definition Template Number", Here()));
};

// Remove compiler warning
mars2gribUnreachable();
};

} // namespace metkit::mars2grib::backend::validation
4 changes: 0 additions & 4 deletions src/metkit/mars2grib/backend/checks/matchLocalDefinitionNumber.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include <vector>

#include "eckit/log/Log.h"
#include "metkit/mars2grib/utils/generalUtils.h"

#include "metkit/config/LibMetkit.h"
#include "metkit/mars2grib/utils/enableOptions.h"
Expand Down Expand Up @@ -113,9 +112,6 @@ void match_LocalDefinitionNumber_or_throw(const OptDict_t& opt, const OutDict_t&
std::throw_with_nested(
Mars2GribValidationException("Unable to validate Local Definition Number in Local Use Section", Here()));
};

// Remove compiler warning
mars2gribUnreachable();
};

} // namespace metkit::mars2grib::backend::validation
4 changes: 0 additions & 4 deletions src/metkit/mars2grib/backend/checks/matchProductDefinitionTemplateNumber.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include <vector>

#include "eckit/log/Log.h"
#include "metkit/mars2grib/utils/generalUtils.h"

#include "metkit/config/LibMetkit.h"
#include "metkit/mars2grib/utils/enableOptions.h"
Expand Down Expand Up @@ -106,9 +105,6 @@ void match_ProductDefinitionTemplateNumber_or_throw(const OptDict_t& opt, const
std::throw_with_nested(
Mars2GribValidationException("Unable to validate Product Definition Template Number", Here()));
};

// Remove compiler warning
mars2gribUnreachable();
};

} // namespace metkit::mars2grib::backend::validation
1 change: 0 additions & 1 deletion src/metkit/mars2grib/backend/compile-time-registry-engine/EntryVariantRegistry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@
#include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
#include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
#include "metkit/mars2grib/backend/compile-time-registry-engine/utils.h"
#include "metkit/mars2grib/utils/generalUtils.h"

namespace metkit::mars2grib::backend::compile_time_registry_engine {

Expand Down
1 change: 0 additions & 1 deletion src/metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@

// Project includes
#include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
#include "metkit/mars2grib/utils/generalUtils.h"

namespace metkit::mars2grib::backend::compile_time_registry_engine {

Expand Down
1 change: 0 additions & 1 deletion src/metkit/mars2grib/backend/compile-time-registry-engine/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
#include <utility>

// Project includes
#include "metkit/mars2grib/utils/generalUtils.h"

namespace metkit::mars2grib::backend::compile_time_registry_engine {

Expand Down
1 change: 0 additions & 1 deletion src/metkit/mars2grib/backend/compile-time-registry-engine/makeEntryCallbacksRegistry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@
#include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
#include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
#include "metkit/mars2grib/backend/compile-time-registry-engine/utils.h"
#include "metkit/mars2grib/utils/generalUtils.h"

namespace metkit::mars2grib::backend::compile_time_registry_engine {

Expand Down
1 change: 0 additions & 1 deletion src/metkit/mars2grib/backend/compile-time-registry-engine/makePhaseCallbacksRegistry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@
// Project includes
#include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
#include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
#include "metkit/mars2grib/utils/generalUtils.h"

namespace metkit::mars2grib::backend::compile_time_registry_engine {

Expand Down
1 change: 0 additions & 1 deletion src/metkit/mars2grib/backend/compile-time-registry-engine/makeVariantCallbacksRegistry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@
// Project includes
#include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
#include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
#include "metkit/mars2grib/utils/generalUtils.h"


namespace metkit::mars2grib::backend::compile_time_registry_engine {
Expand Down
1 change: 0 additions & 1 deletion src/metkit/mars2grib/backend/compile-time-registry-engine/utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
#include <utility>

// Project includes
#include "metkit/mars2grib/utils/generalUtils.h"

namespace metkit::mars2grib::backend::compile_time_registry_engine::detail {

Expand Down
1 change: 0 additions & 1 deletion src/metkit/mars2grib/backend/concepts/AllConcepts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@

// Project includes
#include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
#include "metkit/mars2grib/utils/generalUtils.h"

#include "metkit/mars2grib/backend/concepts/analysis/analysisConceptDescriptor.h"
#include "metkit/mars2grib/backend/concepts/composition/compositionConceptDescriptor.h"
Expand Down
1 change: 0 additions & 1 deletion src/metkit/mars2grib/backend/concepts/EncodingCallbacksRegistry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@
#include "metkit/mars2grib/backend/compile-time-registry-engine/makePhaseCallbacksRegistry.h"
#include "metkit/mars2grib/backend/concepts/AllConcepts.h"
#include "metkit/mars2grib/backend/concepts/GeneralRegistry.h"
#include "metkit/mars2grib/utils/generalUtils.h"

namespace metkit::mars2grib::backend::concepts_ {

Expand Down
1 change: 0 additions & 1 deletion src/metkit/mars2grib/backend/concepts/GeneralRegistry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@
#include "metkit/mars2grib/backend/compile-time-registry-engine/EntryVariantRegistry.h"
#include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
#include "metkit/mars2grib/backend/concepts/AllConcepts.h"
#include "metkit/mars2grib/utils/generalUtils.h"

namespace metkit::mars2grib::backend::concepts_ {

Expand Down
1 change: 0 additions & 1 deletion src/metkit/mars2grib/backend/concepts/MatchingCallbacksRegistry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@
#include "metkit/mars2grib/backend/compile-time-registry-engine/makeEntryCallbacksRegistry.h"
#include "metkit/mars2grib/backend/concepts/AllConcepts.h"
#include "metkit/mars2grib/backend/concepts/GeneralRegistry.h"
#include "metkit/mars2grib/utils/generalUtils.h"

namespace metkit::mars2grib::backend::concepts_ {

Expand Down
10 changes: 1 addition & 9 deletions src/metkit/mars2grib/backend/concepts/analysis/analysisConceptDescriptor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
// Registry engine
#include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
#include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
#include "metkit/mars2grib/utils/generalUtils.h"

// Core concept includes
#include "metkit/mars2grib/backend/concepts/analysis/analysisEncoding.h"
Expand Down Expand Up @@ -123,16 +122,9 @@ struct AnalysisConcept : RegisterEntryDescriptor<AnalysisType, AnalysisList> {
if constexpr (analysisApplicable<Stage, Sec, Variant>()) {
return &AnalysisOp<Stage, Sec, Variant, MarsDict_t, ParDict_t, OptDict_t, OutDict_t>;
}
else {
return nullptr;
}
}
else {
return nullptr;
}

// Avoid compiler warnings
mars2gribUnreachable();
return nullptr;
}

///
Expand Down
4 changes: 0 additions & 4 deletions src/metkit/mars2grib/backend/concepts/analysis/analysisEncoding.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
// Core concept includes
#include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
#include "metkit/mars2grib/backend/concepts/analysis/analysisEnum.h"
#include "metkit/mars2grib/utils/generalUtils.h"

// Deductions
#include "metkit/mars2grib/backend/deductions/lengthOfTimeWindow.h"
Expand Down Expand Up @@ -177,9 +176,6 @@ void AnalysisOp(const MarsDict_t& mars, const ParDict_t& par, const OptDict_t& o

// Concept invoked outside its applicability domain
MARS2GRIB_CONCEPT_THROW(analysis, "Concept called when not applicable...");

// Remove compiler warning
mars2gribUnreachable();
}

} // namespace metkit::mars2grib::backend::concepts_
1 change: 0 additions & 1 deletion src/metkit/mars2grib/backend/concepts/analysis/analysisEnum.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@

// Core concept includes
#include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
#include "metkit/mars2grib/utils/generalUtils.h"

namespace metkit::mars2grib::backend::concepts_ {

Expand Down
1 change: 0 additions & 1 deletion src/metkit/mars2grib/backend/concepts/analysis/analysisMatcher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
// Utils
#include "metkit/mars2grib/backend/concepts/analysis/analysisEnum.h"
#include "metkit/mars2grib/utils/dictionary_traits/dictionary_access_traits.h"
#include "metkit/mars2grib/utils/generalUtils.h"

namespace metkit::mars2grib::backend::concepts_ {

Expand Down
10 changes: 1 addition & 9 deletions src/metkit/mars2grib/backend/concepts/composition/compositionConceptDescriptor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
// Registry engine
#include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
#include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
#include "metkit/mars2grib/utils/generalUtils.h"

// Core concept includes
#include "metkit/mars2grib/backend/concepts/composition/compositionEncoding.h"
Expand Down Expand Up @@ -123,16 +122,9 @@ struct CompositionConcept : RegisterEntryDescriptor<CompositionType, Composition
if constexpr (compositionApplicable<Stage, Sec, Variant>()) {
return &CompositionOp<Stage, Sec, Variant, MarsDict_t, ParDict_t, OptDict_t, OutDict_t>;
}
else {
return nullptr;
}
}
else {
return nullptr;
}

// Avoid compiler warnings
mars2gribUnreachable();
return nullptr;
}

///
Expand Down
4 changes: 0 additions & 4 deletions src/metkit/mars2grib/backend/concepts/composition/compositionEncoding.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
// Core concept includes
#include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
#include "metkit/mars2grib/backend/concepts/composition/compositionEnum.h"
#include "metkit/mars2grib/utils/generalUtils.h"

// Deductions
#include "metkit/mars2grib/backend/deductions/constituentType.h"
Expand Down Expand Up @@ -173,9 +172,6 @@ void CompositionOp(const MarsDict_t& mars, const ParDict_t& par, const OptDict_t

// Concept invoked outside its applicability domain
MARS2GRIB_CONCEPT_THROW(composition, "Concept called when not applicable...");

// Remove compiler warning
mars2gribUnreachable();
}

} // namespace metkit::mars2grib::backend::concepts_
1 change: 0 additions & 1 deletion src/metkit/mars2grib/backend/concepts/composition/compositionEnum.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@

// Core concept includes
#include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
#include "metkit/mars2grib/utils/generalUtils.h"

namespace metkit::mars2grib::backend::concepts_ {

Expand Down
1 change: 0 additions & 1 deletion src/metkit/mars2grib/backend/concepts/composition/compositionMatcher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
// Utils
#include "metkit/mars2grib/backend/concepts/composition/compositionEnum.h"
#include "metkit/mars2grib/utils/dictionary_traits/dictionary_access_traits.h"
#include "metkit/mars2grib/utils/generalUtils.h"

namespace metkit::mars2grib::backend::concepts_ {

Expand Down
Loading
Loading