[Mesa-dev] [PATCH] util: fix NORETURN for msvc, add HAVE_FUNC_ATTRIBUTE_NORETURN to c99_compat.h

[Jose Fonseca]

On 10/01/18 02:15, sroland at vmware.com wrote:
> From: Roland Scheidegger <sroland at vmware.com>
> 
> We've seen some problems internally due to macro redefinition.
> Fix this by adding HAVE_FUNC_ATTRIBUTE_NORETURN to c99_compat.h,
> and defining it for msvc.
> And avoid redefinition just in case.
> ---
>   include/c99_compat.h |  1 +
>   src/util/macros.h    | 12 ++++++++----
>   2 files changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/include/c99_compat.h b/include/c99_compat.h
> index cb690c6..81621a7 100644
> --- a/include/c99_compat.h
> +++ b/include/c99_compat.h
> @@ -164,6 +164,7 @@ test_c99_compat_h(const void * restrict a,
>   #    define HAVE_FUNC_ATTRIBUTE_FORMAT 1
>   #    define HAVE_FUNC_ATTRIBUTE_PACKED 1
>   #    define HAVE_FUNC_ATTRIBUTE_ALIAS 1
> +#    define HAVE_FUNC_ATTRIBUTE_NORETURN 1
>   
>   #    if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
>          /* https://gcc.gnu.org/onlinedocs/gcc-4.3.6/gcc/Other-Builtins.html */
> diff --git a/src/util/macros.h b/src/util/macros.h
> index 2a08407..5ce0e57 100644
> --- a/src/util/macros.h
> +++ b/src/util/macros.h
> @@ -171,10 +171,14 @@ do {                       \
>   #define ATTRIBUTE_RETURNS_NONNULL
>   #endif
>   
> -#ifdef HAVE_FUNC_ATTRIBUTE_NORETURN
> -#define NORETURN __attribute__((__noreturn__))
> -#else
> -#define NORETURN
> +#ifndef NORETURN
> +#  ifdef _MSC_VER
> +#    define NORETURN __declspec(noreturn)
> +#  elif defined HAVE_FUNC_ATTRIBUTE_NORETURN
> +#    define NORETURN __attribute__((__noreturn__))
> +#  else
> +#    define NORETURN
> +#  endif
>   #endif
>   
>   #ifdef __cplusplus
> 

Reviewed-by: Jose Fonseca <jfonseca at vmware.com>