RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-06-15 10:42:09 +00:00
Code Issues Activity Actions

Revert "AK: Fix build with Clang>=12"

Browse source 
This reverts commit 338bb73289.

This didn't work, the OSS-Fuzz build (using clang 12) is still failing.
We'll just disable dbgln() checks when compiling with any clang for now.
This commit is contained in:
Linus Groh 2021-02-12 18:04:40 +01:00 • committed by Andreas Kling
parent 29045f84d4
commit ca69cab532
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
AK/Format.h
View file

@ -38,7 +38,7 @@
#endif #endif
#ifndef DBGLN_NO_COMPILETIME_FORMAT_CHECK #ifndef DBGLN_NO_COMPILETIME_FORMAT_CHECK
// Note: Clang 12 adds support for CTAD on NTTPs, this would fail with any version prior to that. // Note: Clang 12 adds support for CTAD, this would fail with any version prior to that.
# if defined(__clang__) && __clang_major__ < 12 # if defined(__clang__) && __clang_major__ < 12
# define DBGLN_NO_COMPILETIME_FORMAT_CHECK # define DBGLN_NO_COMPILETIME_FORMAT_CHECK
# endif # endif
@ -47,15 +47,15 @@
#ifndef DBGLN_NO_COMPILETIME_FORMAT_CHECK #ifndef DBGLN_NO_COMPILETIME_FORMAT_CHECK
namespace { namespace {
template<size_t N, StringLiteral<N> fmt> template<size_t N>
consteval auto extract_used_argument_index(size_t specifier_start_index, size_t specifier_end_index, size_t& next_implicit_argument_index) consteval auto extract_used_argument_index(const char (&fmt)[N], size_t specifier_start_index, size_t specifier_end_index, size_t& next_implicit_argument_index)
{ {
struct { struct {
size_t index_value { 0 }; size_t index_value { 0 };
bool saw_explicit_index { false }; bool saw_explicit_index { false };
} state; } state;
for (size_t i = specifier_start_index; i < specifier_end_index; ++i) { for (size_t i = specifier_start_index; i < specifier_end_index; ++i) {
auto c = fmt.data[i]; auto c = fmt[i];
if (c > '9' || c < '0') if (c > '9' || c < '0')
break; break;
@ -71,8 +71,8 @@ consteval auto extract_used_argument_index(size_t specifier_start_index, size_t
} }
// FIXME: We should rather parse these format strings at compile-time if possible. // FIXME: We should rather parse these format strings at compile-time if possible.
template<size_t N, StringLiteral<N> fmt> template<size_t N>
consteval auto count_fmt_params() consteval auto count_fmt_params(const char (&fmt)[N])
{ {
struct { struct {
// FIXME: Switch to variable-sized storage whenever we can come up with one :) // FIXME: Switch to variable-sized storage whenever we can come up with one :)
@ -91,10 +91,10 @@ consteval auto count_fmt_params()
} result; } result;
for (size_t i = 0; i < N; ++i) { for (size_t i = 0; i < N; ++i) {
auto ch = fmt.data[i]; auto ch = fmt[i];
switch (ch) { switch (ch) {
case '{': case '{':
if (i + 1 < N && fmt.data[i + 1] == '{') { if (i + 1 < N && fmt[i + 1] == '{') {
++i; ++i;
continue; continue;
} }
@ -108,7 +108,7 @@ consteval auto count_fmt_params()
++result.unclosed_braces; ++result.unclosed_braces;
break; break;
case '}': case '}':
if (i + 1 < N && fmt.data[i + 1] == '}') { if (i + 1 < N && fmt[i + 1] == '}') {
++i; ++i;
continue; continue;
} }
@ -123,7 +123,7 @@ consteval auto count_fmt_params()
if (result.total_used_argument_count >= result.used_arguments.size()) if (result.total_used_argument_count >= result.used_arguments.size())
result.internal_error = "Format-String Checker internal error: Too many format arguments in format string"; result.internal_error = "Format-String Checker internal error: Too many format arguments in format string";
auto used_argument_index = extract_used_argument_index<N, fmt>(specifier_start_index, i, result.next_implicit_argument_index); auto used_argument_index = extract_used_argument_index<N>(fmt, specifier_start_index, i, result.next_implicit_argument_index);
if (used_argument_index + 1 != result.next_implicit_argument_index) if (used_argument_index + 1 != result.next_implicit_argument_index)
result.has_explicit_argument_references = true; result.has_explicit_argument_references = true;
result.used_arguments[result.total_used_argument_count++] = used_argument_index; result.used_arguments[result.total_used_argument_count++] = used_argument_index;
@ -140,7 +140,7 @@ consteval auto count_fmt_params()
} }
} }
template<size_t N, StringLiteral<N> fmt, size_t param_count, auto check = count_fmt_params<N, fmt>()> template<size_t N, StringLiteral<N> fmt, size_t param_count, auto check = count_fmt_params<N>(fmt.data)>
constexpr bool check_format_parameter_consistency() constexpr bool check_format_parameter_consistency()
{ {
static_assert(check.internal_error.data[0] == 0, "Some internal error occured, try looking at the check function type for the error"); static_assert(check.internal_error.data[0] == 0, "Some internal error occured, try looking at the check function type for the error");