From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 1 Feb 2022 14:28:19 +0000 (+0100)
Subject: fundamental: support assert_se() in EFI mode too
X-Git-Tag: v251-rc1~389^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b23a6c40ac42c5673c6817ddf174983497519da;p=thirdparty%2Fsystemd.git

fundamental: support assert_se() in EFI mode too
---

diff --git a/src/boot/efi/assert.c b/src/boot/efi/assert.c
index 7a25526de2f..bb16d2bf932 100644
--- a/src/boot/efi/assert.c
+++ b/src/boot/efi/assert.c
@@ -1,9 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#ifndef NDEBUG
-
 #include <efi.h>
 #include <efilib.h>
+
 #include "util.h"
 
 void efi_assert(const char *expr, const char *file, unsigned line, const char *function) {
@@ -11,5 +10,3 @@ void efi_assert(const char *expr, const char *file, unsigned line, const char *f
         for (;;)
                 BS->Stall(60 * 1000 * 1000);
 }
-
-#endif
diff --git a/src/fundamental/macro-fundamental.h b/src/fundamental/macro-fundamental.h
index d597c743bbb..a1cbc3a5b3b 100644
--- a/src/fundamental/macro-fundamental.h
+++ b/src/fundamental/macro-fundamental.h
@@ -53,14 +53,16 @@
 #define CONCATENATE(x, y) XCONCATENATE(x, y)
 
 #ifdef SD_BOOT
+        void efi_assert(const char *expr, const char *file, unsigned line, const char *function) _noreturn_;
+
         #ifdef NDEBUG
                 #define assert(expr)
                 #define assert_not_reached() __builtin_unreachable()
         #else
-                void efi_assert(const char *expr, const char *file, unsigned line, const char *function) _noreturn_;
                 #define assert(expr) ({ _likely_(expr) ? VOID_0 : efi_assert(#expr, __FILE__, __LINE__, __PRETTY_FUNCTION__); })
                 #define assert_not_reached() efi_assert("Code should not be reached", __FILE__, __LINE__, __PRETTY_FUNCTION__)
         #endif
+        #define assert_se(expr) ({ _likely_(expr) ? VOID_0 : efi_assert(#expr, __FILE__, __LINE__, __PRETTY_FUNCTION__); })
 
         #define memcpy(a, b, c) CopyMem((a), (b), (c))
         #define free(a) FreePool(a)