From: Pauli <pauli@openssl.org>
Date: Wed, 25 Oct 2023 23:58:11 +0000 (+1100)
Subject: tag ossl_assert not failing as being 'likely' to improve optimisation
X-Git-Tag: openssl-3.3.0-alpha1~687
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6874003e96b64b665acc20f65a5bcb3e4d315ce4;p=thirdparty%2Fopenssl.git

tag ossl_assert not failing as being 'likely' to improve optimisation

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22516)
---

diff --git a/include/internal/common.h b/include/internal/common.h
index 15666f11108..a9e3b7a729d 100644
--- a/include/internal/common.h
+++ b/include/internal/common.h
@@ -38,7 +38,7 @@
 # endif
 
 # ifdef NDEBUG
-#  define ossl_assert(x) ((x) != 0)
+#  define ossl_assert(x) likely((x) != 0)
 # else
 __owur static ossl_inline int ossl_assert_int(int expr, const char *exprstr,
                                               const char *file, int line)