beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 07:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Everywhere: Fully qualify IsLvalueReference in TRY() macros

Browse source 
If USING_AK_GLOBALLY is not defined, the name IsLvalueReference might
not be available in the global namespace. Follow the pattern established
in LibTest to fully qualify AK types in macros to avoid this problem.
This commit is contained in:
Andrew Kaster 2023-01-14 16:34:44 -07:00 committed by Linus Groh
parent 56512caa73
commit f5d253dcfa
Notes: sideshowbarker 2024-07-17 21:26:19 +09:00 
Author: https://github.com/ADKaster
Commit: https://github.com/SerenityOS/serenity/commit/f5d253dcfa
Pull-request: https://github.com/SerenityOS/serenity/pull/17022
11 changed files with 96 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
AK/Try.h
View file

@ -7,6 +7,7 @@
#pragma once #pragma once
#include <AK/Diagnostics.h> #include <AK/Diagnostics.h>
#include <AK/StdLibExtras.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.
@ -20,25 +21,25 @@
// from a fallible expression. This will not do what you want; the statement expression // from a fallible expression. This will not do what you want; the statement expression
// will create a copy regardless, so it is explicitly disallowed. // will create a copy regardless, so it is explicitly disallowed.
#define TRY(expression) \ #define TRY(expression) \
({ \ ({ \
/* Ignore -Wshadow to allow nesting the macro. */ \ /* Ignore -Wshadow to allow nesting the macro. */ \
AK_IGNORE_DIAGNOSTIC("-Wshadow", \ AK_IGNORE_DIAGNOSTIC("-Wshadow", \
auto _temporary_result = (expression)); \ auto _temporary_result = (expression)); \
static_assert(!IsLvalueReference<decltype(_temporary_result.release_value())>, \ static_assert(!::AK::Detail::IsLvalueReference<decltype(_temporary_result.release_value())>, \
"Do not return a reference from a fallible expression"); \ "Do not return a reference from a fallible 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(); \
}) })
#define MUST(expression) \ #define MUST(expression) \
({ \ ({ \
/* Ignore -Wshadow to allow nesting the macro. */ \ /* Ignore -Wshadow to allow nesting the macro. */ \
AK_IGNORE_DIAGNOSTIC("-Wshadow", \ AK_IGNORE_DIAGNOSTIC("-Wshadow", \
auto _temporary_result = (expression)); \ auto _temporary_result = (expression)); \
static_assert(!IsLvalueReference<decltype(_temporary_result.release_value())>, \ static_assert(!::AK::Detail::IsLvalueReference<decltype(_temporary_result.release_value())>, \
"Do not return a reference from a fallible expression"); \ "Do not return a reference from a fallible expression"); \
VERIFY(!_temporary_result.is_error()); \ VERIFY(!_temporary_result.is_error()); \
_temporary_result.release_value(); \ _temporary_result.release_value(); \
}) })

16
Kernel/Net/Socket.h
View file

@ -184,14 +184,14 @@ private:
}; };
// This is a special variant of TRY() that also updates the socket's SO_ERROR field on error. // This is a special variant of TRY() that also updates the socket's SO_ERROR field on error.
#define SOCKET_TRY(expression) \ #define SOCKET_TRY(expression) \
({ \ ({ \
auto result = (expression); \ auto result = (expression); \
if (result.is_error()) \ if (result.is_error()) \
return set_so_error(result.release_error()); \ return set_so_error(result.release_error()); \
static_assert(!IsLvalueReference<decltype(result.release_value())>, \ static_assert(!::AK::Detail::IsLvalueReference<decltype(result.release_value())>, \
"Do not return a reference from a fallible expression"); \ "Do not return a reference from a fallible expression"); \
result.release_value(); \ result.release_value(); \
}) })
} }

16
Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp
View file

@ -231,14 +231,14 @@ struct CLDR {
// Some parsing is expected to fail. For example, the CLDR contains language mappings // Some parsing is expected to fail. For example, the CLDR contains language mappings
// with locales such as "en-GB-oed" that are canonically invalid locale IDs. // with locales such as "en-GB-oed" that are canonically invalid locale IDs.
#define TRY_OR_DISCARD(expression) \ #define TRY_OR_DISCARD(expression) \
({ \ ({ \
auto _temporary_result = (expression); \ auto _temporary_result = (expression); \
if (_temporary_result.is_error()) \ if (_temporary_result.is_error()) \
return; \ return; \
static_assert(!IsLvalueReference<decltype(_temporary_result.release_value())>, \ static_assert(!::AK::Detail::IsLvalueReference<decltype(_temporary_result.release_value())>, \
"Do not return a reference from a fallible expression"); \ "Do not return a reference from a fallible expression"); \
_temporary_result.release_value(); \ _temporary_result.release_value(); \
}) })
static ErrorOr<LanguageMapping> parse_language_mapping(CLDR& cldr, StringView key, StringView alias) static ErrorOr<LanguageMapping> parse_language_mapping(CLDR& cldr, StringView key, StringView alias)

16
Userland/Libraries/LibAudio/LoaderError.h
View file

@ -66,12 +66,12 @@ struct LoaderError {
} }
// Convenience TRY-like macro to convert an Error to a LoaderError // Convenience TRY-like macro to convert an Error to a LoaderError
#define LOADER_TRY(expression) \ #define LOADER_TRY(expression) \
({ \ ({ \
auto _temporary_result = (expression); \ auto _temporary_result = (expression); \
if (_temporary_result.is_error()) \ if (_temporary_result.is_error()) \
return LoaderError(_temporary_result.release_error()); \ return LoaderError(_temporary_result.release_error()); \
static_assert(!IsLvalueReference<decltype(_temporary_result.release_value())>, \ static_assert(!::AK::Detail::IsLvalueReference<decltype(_temporary_result.release_value())>, \
"Do not return a reference from a fallible expression"); \ "Do not return a reference from a fallible expression"); \
_temporary_result.release_value(); \ _temporary_result.release_value(); \
}) })

24
Userland/Libraries/LibJS/Runtime/Completion.h
View file

@ -16,18 +16,18 @@
namespace JS { namespace JS {
#define TRY_OR_THROW_OOM(vm, expression) \ #define TRY_OR_THROW_OOM(vm, expression) \
({ \ ({ \
/* Ignore -Wshadow to allow nesting the macro. */ \ /* Ignore -Wshadow to allow nesting the macro. */ \
AK_IGNORE_DIAGNOSTIC("-Wshadow", \ AK_IGNORE_DIAGNOSTIC("-Wshadow", \
auto _temporary_result = (expression)); \ auto _temporary_result = (expression)); \
if (_temporary_result.is_error()) { \ if (_temporary_result.is_error()) { \
VERIFY(_temporary_result.error().code() == ENOMEM); \ VERIFY(_temporary_result.error().code() == ENOMEM); \
return vm.throw_completion<JS::InternalError>(JS::ErrorType::OutOfMemory); \ return vm.throw_completion<JS::InternalError>(JS::ErrorType::OutOfMemory); \
} \ } \
static_assert(!IsLvalueReference<decltype(_temporary_result.release_value())>, \ static_assert(!::AK::Detail::IsLvalueReference<decltype(_temporary_result.release_value())>, \
"Do not return a reference from a fallible expression"); \ "Do not return a reference from a fallible expression"); \
_temporary_result.release_value(); \ _temporary_result.release_value(); \
}) })
// 6.2.3 The Completion Record Specification Type, https://tc39.es/ecma262/#sec-completion-record-specification-type // 6.2.3 The Completion Record Specification Type, https://tc39.es/ecma262/#sec-completion-record-specification-type

4
Userland/Libraries/LibJS/Runtime/PromiseCapability.h
View file

@ -53,7 +53,7 @@ private:
return (capability)->promise(); \ return (capability)->promise(); \
} \ } \
\ \
static_assert(!IsLvalueReference<decltype(_temporary_try_or_reject_result.release_value())>, \ static_assert(!::AK::Detail::IsLvalueReference<decltype(_temporary_try_or_reject_result.release_value())>, \
"Do not return a reference from a fallible expression"); \ "Do not return a reference from a fallible expression"); \
\ \
/* 2. Else if value is a Completion Record, set value to value.[[Value]]. */ \ /* 2. Else if value is a Completion Record, set value to value.[[Value]]. */ \
@ -79,7 +79,7 @@ private:
return Value { (capability)->promise() }; \ return Value { (capability)->promise() }; \
} \ } \
\ \
static_assert(!IsLvalueReference<decltype(_temporary_try_or_reject_result.release_value())>, \ static_assert(!::AK::Detail::IsLvalueReference<decltype(_temporary_try_or_reject_result.release_value())>, \
"Do not return a reference from a fallible expression"); \ "Do not return a reference from a fallible expression"); \
\ \
/* 2. Else if value is a Completion Record, set value to value.[[Value]]. */ \ /* 2. Else if value is a Completion Record, set value to value.[[Value]]. */ \

22
Userland/Libraries/LibVideo/DecoderError.h
View file

@ -77,17 +77,17 @@ private:
DeprecatedString m_description; DeprecatedString m_description;
}; };
#define DECODER_TRY(category, expression) \ #define DECODER_TRY(category, expression) \
({ \ ({ \
auto _result = ((expression)); \ auto _result = ((expression)); \
if (_result.is_error()) [[unlikely]] { \ if (_result.is_error()) [[unlikely]] { \
auto _error_string = _result.release_error().string_literal(); \ auto _error_string = _result.release_error().string_literal(); \
return DecoderError::from_source_location( \ return DecoderError::from_source_location( \
((category)), _error_string, SourceLocation::current()); \ ((category)), _error_string, SourceLocation::current()); \
} \ } \
static_assert(!IsLvalueReference<decltype(_result.release_value())>, \ static_assert(!::AK::Detail::IsLvalueReference<decltype(_result.release_value())>, \
"Do not return a reference from a fallible expression"); \ "Do not return a reference from a fallible expression"); \
_result.release_value(); \ _result.release_value(); \
}) })
#define DECODER_TRY_ALLOC(expression) DECODER_TRY(DecoderErrorCategory::Memory, expression) #define DECODER_TRY_ALLOC(expression) DECODER_TRY(DecoderErrorCategory::Memory, expression)

2
Userland/Libraries/LibVideo/PlaybackManager.cpp
View file

@ -273,7 +273,7 @@ bool PlaybackManager::decode_and_queue_one_sample()
m_present_timer->start(0); \ m_present_timer->start(0); \
return false; \ return false; \
} \ } \
static_assert(!IsLvalueReference<decltype(_temporary_result.release_value())>, \ static_assert(!::AK::Detail::IsLvalueReference<decltype(_temporary_result.release_value())>, \
"Do not return a reference from a fallible expression"); \ "Do not return a reference from a fallible expression"); \
_temporary_result.release_value(); \ _temporary_result.release_value(); \
}) })

16
Userland/Libraries/LibWeb/Fetch/Fetching/Fetching.cpp
View file

@ -42,14 +42,14 @@
namespace Web::Fetch::Fetching { namespace Web::Fetch::Fetching {
#define TRY_OR_IGNORE(expression) \ #define TRY_OR_IGNORE(expression) \
({ \ ({ \
auto _temporary_result = (expression); \ auto _temporary_result = (expression); \
if (_temporary_result.is_error()) \ if (_temporary_result.is_error()) \
return; \ return; \
static_assert(!IsLvalueReference<decltype(_temporary_result.release_value())>, \ static_assert(!::AK::Detail::IsLvalueReference<decltype(_temporary_result.release_value())>, \
"Do not return a reference from a fallible expression"); \ "Do not return a reference from a fallible expression"); \
_temporary_result.release_value(); \ _temporary_result.release_value(); \
}) })
// https://fetch.spec.whatwg.org/#concept-fetch // https://fetch.spec.whatwg.org/#concept-fetch

16
Userland/Libraries/LibWeb/WebDriver/ExecuteScript.cpp
View file

@ -31,14 +31,14 @@
namespace Web::WebDriver { namespace Web::WebDriver {
#define TRY_OR_JS_ERROR(expression) \ #define TRY_OR_JS_ERROR(expression) \
({ \ ({ \
auto _temporary_result = (expression); \ auto _temporary_result = (expression); \
if (_temporary_result.is_error()) [[unlikely]] \ if (_temporary_result.is_error()) [[unlikely]] \
return ExecuteScriptResultType::JavaScriptError; \ return ExecuteScriptResultType::JavaScriptError; \
static_assert(!IsLvalueReference<decltype(_temporary_result.release_value())>, \ static_assert(!::AK::Detail::IsLvalueReference<decltype(_temporary_result.release_value())>, \
"Do not return a reference from a fallible expression"); \ "Do not return a reference from a fallible expression"); \
_temporary_result.release_value(); \ _temporary_result.release_value(); \
}) })
static ErrorOr<JsonValue, ExecuteScriptResultType> internal_json_clone_algorithm(JS::Realm&, JS::Value, HashTable<JS::Object*>& seen); static ErrorOr<JsonValue, ExecuteScriptResultType> internal_json_clone_algorithm(JS::Realm&, JS::Value, HashTable<JS::Object*>& seen);

20
Userland/Utilities/matroska.cpp
View file

@ -10,16 +10,16 @@
#include <LibMain/Main.h> #include <LibMain/Main.h>
#include <LibVideo/Containers/Matroska/Reader.h> #include <LibVideo/Containers/Matroska/Reader.h>
#define TRY_PARSE(expression) \ #define TRY_PARSE(expression) \
({ \ ({ \
auto _temporary_result = ((expression)); \ auto _temporary_result = ((expression)); \
if (_temporary_result.is_error()) [[unlikely]] { \ if (_temporary_result.is_error()) [[unlikely]] { \
outln("Encountered a parsing error: {}", _temporary_result.error().string_literal()); \ outln("Encountered a parsing error: {}", _temporary_result.error().string_literal()); \
return Error::from_string_literal("Failed to parse :("); \ return Error::from_string_literal("Failed to parse :("); \
} \ } \
static_assert(!IsLvalueReference<decltype(_temporary_result.release_value())>, \ static_assert(!::AK::Detail::IsLvalueReference<decltype(_temporary_result.release_value())>, \
"Do not return a reference from a fallible expression"); \ "Do not return a reference from a fallible expression"); \
_temporary_result.release_value(); \ _temporary_result.release_value(); \
}) })
ErrorOr<int> serenity_main(Main::Arguments arguments) ErrorOr<int> serenity_main(Main::Arguments arguments)