From d923d6234dde879eb9b98f51a77d3f3c1ddd2488 Mon Sep 17 00:00:00 2001
From: Roman Stratiienko <r.stratiienko@gmail.com>
Date: Thu, 21 Sep 2023 00:06:15 +0300
Subject: [PATCH] Revert "util: Add NONNULL macro"

We agreed in [1] not to use it since it has little value,
but making a code less readable.

[1]: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25256

This reverts commit 21dcde096f351f83a2df7aa9f42a7276b5454c81.

Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Reviewed-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25256>
---
 meson.build       | 1 -
 src/util/macros.h | 6 ------
 2 files changed, 7 deletions(-)

diff --git a/meson.build b/meson.build
index c877eb827ba..b9cba649414 100644
--- a/meson.build
+++ b/meson.build
@@ -926,7 +926,6 @@ endforeach
 _attributes = [
   'const', 'flatten', 'malloc', 'pure', 'unused', 'warn_unused_result',
   'weak', 'format', 'packed', 'returns_nonnull', 'alias', 'noreturn',
-  'nonnull',
 ]
 foreach a : cc.get_supported_function_attributes(_attributes)
   pre_args += '-DHAVE_FUNC_ATTRIBUTE_@0@'.format(a.to_upper())
diff --git a/src/util/macros.h b/src/util/macros.h
index 0bf1dac413f..bffabfb52a8 100644
--- a/src/util/macros.h
+++ b/src/util/macros.h
@@ -317,12 +317,6 @@ do {                       \
 #define ASSERTED
 #endif
 
-#ifdef HAVE_FUNC_ATTRIBUTE_NONNULL
-#define NONNULL __attribute__((__nonnull__))
-#else
-#define NONNULL
-#endif
-
 #ifdef HAVE_FUNC_ATTRIBUTE_WARN_UNUSED_RESULT
 #define MUST_CHECK __attribute__((warn_unused_result))
 #else