AK: Ignore -Wshadow in TRY() and MUST()

This makes the warning in CLion disappear when nesting them.
This commit is contained in:
Linus Groh 2022-12-06 18:19:37 +00:00
parent d2e143eec7
commit 5103e08b77
Notes: sideshowbarker 2024-07-17 03:42:31 +09:00

View file

@ -6,6 +6,8 @@
#pragma once #pragma once
#include <AK/Diagnostics.h>
// NOTE: This macro works with any result type that has the expected APIs. // NOTE: This macro works with any result type that has the expected APIs.
// It's designed with AK::Result and AK::Error in mind. // It's designed with AK::Result and AK::Error in mind.
// //
@ -16,7 +18,9 @@
#define TRY(expression) \ #define TRY(expression) \
({ \ ({ \
auto _temporary_result = (expression); \ /* Ignore -Wshadow to allow nesting the macro. */ \
AK_IGNORE_DIAGNOSTIC("-Wshadow", \
auto _temporary_result = (expression)); \
if (_temporary_result.is_error()) [[unlikely]] \ if (_temporary_result.is_error()) [[unlikely]] \
return _temporary_result.release_error(); \ return _temporary_result.release_error(); \
_temporary_result.release_value(); \ _temporary_result.release_value(); \
@ -24,7 +28,9 @@
#define MUST(expression) \ #define MUST(expression) \
({ \ ({ \
auto _temporary_result = (expression); \ /* Ignore -Wshadow to allow nesting the macro. */ \
AK_IGNORE_DIAGNOSTIC("-Wshadow", \
auto _temporary_result = (expression)); \
VERIFY(!_temporary_result.is_error()); \ VERIFY(!_temporary_result.is_error()); \
_temporary_result.release_value(); \ _temporary_result.release_value(); \
}) })