include/msvcrt: Add noreturn attribute to _assert.

This informs the compiler that no code following an assertion failure will execute (unless NDEBUG is defined), which increases the accuracy of compiler warnings and static analyses. For assert.h, put DECLSPEC_NORETURN before the return type in the function declaration to remain consistent with other MSVCRT function declarations.

include/msvcrt: Add noreturn attribute to _assert.
b6a26817 · Jinoh Kang · Alexandre Julliard · 36575a2e · b6a26817 · b6a26817
Commit b6a26817 authored Jan 28, 2023 by Jinoh Kang Committed by Alexandre Julliard Jan 30, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

exit.c dlls/msvcrt/exit.c +2 -2

exception.c dlls/ntdll/exception.c +1 -1

assert.h include/msvcrt/assert.h +1 -1

No files found.
--- a/dlls/msvcrt/exit.c
+++ b/dlls/msvcrt/exit.c
@@ -290,7 +290,7 @@ unsigned int CDECL _set_abort_behavior(unsigned int flags, unsigned int mask)
 /*********************************************************************
 *              _wassert (MSVCRT.@)
 */
-void CDECL _wassert(const wchar_t* str, const wchar_t* file, unsigned int line)
+void DECLSPEC_NORETURN CDECL _wassert(const wchar_t* str, const wchar_t* file, unsigned int line)
 {
  TRACE("(%s,%s,%d)\n", debugstr_w(str), debugstr_w(file), line);

@@ -311,7 +311,7 @@ void CDECL _wassert(const wchar_t* str, const wchar_t* file, unsigned int line)
 /*********************************************************************
 *		_assert (MSVCRT.@)
 */
-void CDECL _assert(const char* str, const char* file, unsigned int line)
+void DECLSPEC_NORETURN CDECL _assert(const char* str, const char* file, unsigned int line)
 {
    wchar_t strW[1024], fileW[1024];


--- a/dlls/ntdll/exception.c
+++ b/dlls/ntdll/exception.c
@@ -623,7 +623,7 @@ PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry( ULONG_PTR pc, ULONG_PTR *base,
 /*************************************************************
 *            _assert
 */
-void __cdecl _assert( const char *str, const char *file, unsigned int line )
+void DECLSPEC_NORETURN __cdecl _assert( const char *str, const char *file, unsigned int line )
 {
    ERR( "%s:%u: Assertion failed %s\n", file, line, debugstr_a(str) );
    RtlRaiseStatus( EXCEPTION_WINE_ASSERTION );

--- a/include/msvcrt/assert.h
+++ b/include/msvcrt/assert.h
@@ -28,7 +28,7 @@ extern "C" {
 #ifdef NDEBUG
 #define assert(_expr) ((void)0)
 #else
-_ACRTIMP void __cdecl _assert(const char *, const char *, unsigned int);
+_ACRTIMP DECLSPEC_NORETURN void __cdecl _assert(const char *, const char *, unsigned int);
 #define assert(_expr) (void)((!!(_expr)) || (_assert(#_expr, __FILE__, __LINE__), 0))
 #endif