Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-02-20 18:27:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[libc++][format] Fixes constexpr validation.

Browse Source 
The constexpr validation parsed parts of the format string that didn't
belong to the specific replacement field.

Fixes https://llvm.org/PR60536

Reviewed By: #libc, ldionne

Differential Revision: https://reviews.llvm.org/D143402
This commit is contained in:
Mark de Wever 2023-02-06 16:29:30 +01:00
parent 0fc42b38a2
commit ac44dadcbe
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libcxx/include/__format/format_functions.h
View File

@ -261,10 +261,12 @@ __handle_replacement_field(_Iterator __begin, _Iterator __end,
if constexpr (same_as<_Ctx, __compile_time_basic_format_context<_CharT>>) {
__arg_t __type = __ctx.arg(__r.__value);
if (__type == __arg_t::__handle)
if (__type == __arg_t::__none)
std::__throw_format_error("Argument index out of bounds");
else if (__type == __arg_t::__handle)
__ctx.__handle(__r.__value).__parse(__parse_ctx);
else
__format::__compile_time_visit_format_arg(__parse_ctx, __ctx, __type);
else if (__parse)
__format::__compile_time_visit_format_arg(__parse_ctx, __ctx, __type);
} else
_VSTD::__visit_format_arg(
[&](auto __arg) {

4
libcxx/test/std/utilities/format/format.functions/format_tests.h
View File

@ -2617,6 +2617,10 @@ void format_tests(TestFunction check, ExceptionTest check_exception) {
check(SV("{"), SV("{{"));
check(SV("}"), SV("}}"));
check(SV("{:^}"), SV("{{:^}}"));
check(SV("{: ^}"), SV("{{:{}^}}"), CharT(' '));
check(SV("{:{}^}"), SV("{{:{{}}^}}"));
check(SV("{:{ }^}"), SV("{{:{{{}}}^}}"), CharT(' '));
// *** Test argument ID ***
check(SV("hello false true"), SV("hello {0:} {1:}"), false, true);