diff --git a/libcxx/include/__format/format_functions.h b/libcxx/include/__format/format_functions.h --- a/libcxx/include/__format/format_functions.h +++ b/libcxx/include/__format/format_functions.h @@ -261,10 +261,12 @@ 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) { diff --git a/libcxx/test/std/utilities/format/format.functions/format_tests.h b/libcxx/test/std/utilities/format/format.functions/format_tests.h --- a/libcxx/test/std/utilities/format/format.functions/format_tests.h +++ b/libcxx/test/std/utilities/format/format.functions/format_tests.h @@ -2617,6 +2617,10 @@ 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);