Support for constexpr matchers in C++20 (P0784)

To make this all work, I had to remove the stringification cache
from matchers. In theory, this can cause performance penalty in
cases where single matcher instance is stringified multiple times,
but in practice this does not happen much, and the difference is
surprisingly small anyway, because the performance of stringification
is already horrible and full of allocating strings just to throw
them away.

The matcher combinators need P2738 from C++26 to be `constexpr`.

Closes #3091
This commit is contained in:
Martin Hořeňovský
2026-05-12 11:05:02 +02:00
parent 15b9393f0f
commit 651247c7f4
14 changed files with 254 additions and 49 deletions
@@ -12,10 +12,36 @@
*/
#include <catch2/catch_test_macros.hpp>
#include <catch2/matchers/catch_matchers_templated.hpp>
#if defined( CATCH_INTERNAL_CONSTEXPR_MATCHERS_ENABLED )
namespace {
struct MatchNoneMatcher final : public Catch::Matchers::MatcherGenericBase {
public:
template <typename Any>
constexpr bool match( Any&& ) const {
return false;
}
std::string describe() const override {
using namespace std::string_literals;
return "Matches anything"s;
}
};
constexpr MatchNoneMatcher MatchNone() { return MatchNoneMatcher(); }
} // namespace
#endif
TEST_CASE("Deferred static checks") {
STATIC_CHECK(1 == 2);
STATIC_CHECK_FALSE(1 != 2);
#if defined(CATCH_INTERNAL_CONSTEXPR_MATCHERS_ENABLED)
STATIC_CHECK_THAT(1, MatchNone());
#endif
// This last assertion must be executed too
CHECK(1 == 2);
}