Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

Don't follow __assume(false) with std::terminate in NDEBUG builds

Having `std::terminate` as the backstop after `__assume(false)`
would trigger W4702 (unreachable code) with MSVC. As we want to
keep `__assume(false)` for the optimization hint in NDEBUG builds,
we have to avoid mixing in `std::terminate` for those builds.

Fixes #3007
Commit
a1c7ee115f17c1e83b382f33ef2614070974626f
Author
Martin Hořeňovský ·
Parents
d547cae549f4

Files · Download .tar.gz

Changes

 src/catch2/internal/catch_unreachable.hpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/catch2/internal/catch_unreachable.hpp b/src/catch2/internal/catch_unreachable.hpp
index 02cca494..fc3f75b5 100644
--- a/src/catch2/internal/catch_unreachable.hpp
+++ b/src/catch2/internal/catch_unreachable.hpp
@@ -39,9 +39,13 @@ namespace Catch {
             __assume( false );
 #        elif defined( __GNUC__ )
             __builtin_unreachable();
+#        else // vv platform without known optimization hint
+            std::terminate();
 #        endif
-#    endif // ^^ NDEBUG
+#    else  // ^^ NDEBUG
+            // For non-release builds, we prefer termination on bug over UB
             std::terminate();
+#    endif //
         }
 
     } // namespace Detail