This is an archive of the discontinued LLVM Phabricator instance.

Differential D154122

[libc++][format] Removes unneeded includes.
ClosedPublic

Authored by Mordante on Jun 29 2023, 10:58 AM.

Details

Reviewers
philnik
ldionne
Group Reviewers
Restricted Project
Commits
rG285e1e2a0020: [libc++][format] Removes unneeded includes.
Summary

I did a manual review after the post-review comments in D149543

Diff Detail

Event Timeline

Mordante created this revision.Jun 29 2023, 10:58 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 29 2023, 10:58 AM
Harbormaster completed remote builds in B242175: Diff 535910.Jun 29 2023, 11:26 AM
Mordante updated this revision to Diff 535993.Jun 29 2023, 2:06 PM

Retrigger CI

Harbormaster completed remote builds in B242237: Diff 535993.Jun 29 2023, 6:47 PM
Mordante published this revision for review.Jun 30 2023, 8:16 AM
Mordante added subscribers: iana, hans.

@hans These are some removals, this might help a tiny bit with D149543. I try to look at the core issue this weekend.

@iana Does removing these header affect your module patches?

Herald added a project: Restricted Project. · View Herald TranscriptJun 30 2023, 8:16 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
iana added a comment.Jun 30 2023, 11:16 AM
In D154122#4464056, @Mordante wrote:

@iana Does removing these header affect your module patches?

It might require some more exports in the module map, that should be more apparent after D153832

Mordante added a child revision: D154286: [libc++][format] Granularize formatter_output..Jul 1 2023, 12:01 PM
hans added a comment.Jul 3 2023, 6:40 AM

@hans These are some removals, this might help a tiny bit with D149543. I try to look at the core issue this weekend.

Nice, thanks for looking into this!

philnik accepted this revision.Jul 7 2023, 10:46 AM
philnik added a subscriber: philnik.

Out of curiosity, did this actually help with preprocessed code size?

This revision is now accepted and ready to land.Jul 7 2023, 10:46 AM
ldionne accepted this revision.Jul 7 2023, 2:19 PM
Mordante added a comment.Jul 8 2023, 3:38 AM
In D154122#4481340, @philnik wrote:

Out of curiosity, did this actually help with preprocessed code size?

I expect it helps a bit, I'm not convinced this solves the vector issue. I have another patch, but I expect that one not to be enough either. If that doesn't help we can not include <__format/*.h> when using C++ < 23 (basically what Hans already proposed). That will solve it for older language versions. When people start to use C++23 they will either have to bite the bullet or start using modules.

Closed by commit rG285e1e2a0020: [libc++][format] Removes unneeded includes. (authored by Mordante). · Explain WhyJul 8 2023, 3:39 AM
This revision was automatically updated to reflect the committed changes.
Mordante added a commit: rG285e1e2a0020: [libc++][format] Removes unneeded includes..
hans mentioned this in D154286: [libc++][format] Granularize formatter_output..Jul 11 2023, 6:18 AM
iana mentioned this in D155116: [libc++][Modules] Restore the <string> include to <__format/format_functions.h>.Jul 14 2023, 10:49 AM
iana mentioned this in rG33fe4dc91e34: [libc++][Modules] Restore the <string> include to <__format/format_functions.h>.Jul 15 2023, 8:29 AM

Revision Contents

Diff 535910

libcxx/include/__chrono/formatter.h

Show All 38 Lines
#include <__format/format_parse_context.h> #include <__format/format_parse_context.h>
#include <__format/formatter.h> #include <__format/formatter.h>
#include <__format/formatter_output.h> #include <__format/formatter_output.h>
#include <__format/parser_std_format_spec.h> #include <__format/parser_std_format_spec.h>
#include <__memory/addressof.h> #include <__memory/addressof.h>
#include <cmath> #include <cmath>
#include <ctime> #include <ctime>
#include <sstream> #include <sstream>
#include <string>
#include <string_view> #include <string_view>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header # pragma GCC system_header
#endif #endif
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
▲ Show 20 Lines • Show All 776 Lines • Show Last 20 Lines

libcxx/include/__format/container_adaptor.h

// -*- C++ -*- // -*- C++ -*-
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#ifndef _LIBCPP___FORMAT_CONTAINER_ADAPTOR_H #ifndef _LIBCPP___FORMAT_CONTAINER_ADAPTOR_H
#define _LIBCPP___FORMAT_CONTAINER_ADAPTOR_H #define _LIBCPP___FORMAT_CONTAINER_ADAPTOR_H
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header # pragma GCC system_header
#endif #endif
#include <__availability>
#include <__config> #include <__config>
#include <__format/concepts.h> #include <__format/concepts.h>
#include <__format/formatter.h> #include <__format/formatter.h>
#include <__format/range_default_formatter.h> #include <__format/range_default_formatter.h>
#include <__ranges/all.h>
#include <__ranges/ref_view.h> #include <__ranges/ref_view.h>
#include <__type_traits/is_const.h> #include <__type_traits/is_const.h>
#include <__type_traits/maybe_const.h> #include <__type_traits/maybe_const.h>
#include <queue> #include <queue>
#include <stack> #include <stack>
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
▲ Show 20 Lines • Show All 45 Lines • Show Last 20 Lines

libcxx/include/__format/format_arg.h

// -*- C++ -*- // -*- C++ -*-
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#ifndef _LIBCPP___FORMAT_FORMAT_ARG_H #ifndef _LIBCPP___FORMAT_FORMAT_ARG_H
#define _LIBCPP___FORMAT_FORMAT_ARG_H #define _LIBCPP___FORMAT_FORMAT_ARG_H
#include <__assert> #include <__assert>
#include <__concepts/arithmetic.h> #include <__concepts/arithmetic.h>
#include <__config> #include <__config>
#include <__format/concepts.h> #include <__format/concepts.h>
#include <__format/format_error.h>
#include <__format/format_fwd.h> #include <__format/format_fwd.h>
#include <__format/format_parse_context.h> #include <__format/format_parse_context.h>
#include <__functional/invoke.h> #include <__functional/invoke.h>
#include <__memory/addressof.h> #include <__memory/addressof.h>
#include <__type_traits/conditional.h> #include <__type_traits/conditional.h>
#include <__type_traits/is_const.h>
#include <__utility/declval.h>
#include <__utility/forward.h> #include <__utility/forward.h>
#include <__utility/move.h>
#include <__utility/unreachable.h> #include <__utility/unreachable.h>
#include <__variant/monostate.h> #include <__variant/monostate.h>
#include <string> #include <cstdint>
#include <string_view> #include <string_view>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header # pragma GCC system_header
#endif #endif
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
▲ Show 20 Lines • Show All 264 Lines • Show Last 20 Lines

libcxx/include/__format/format_arg_store.h

Show All 15 Lines
#include <__concepts/arithmetic.h> #include <__concepts/arithmetic.h>
#include <__concepts/same_as.h> #include <__concepts/same_as.h>
#include <__config> #include <__config>
#include <__format/concepts.h> #include <__format/concepts.h>
#include <__format/format_arg.h> #include <__format/format_arg.h>
#include <__type_traits/conditional.h> #include <__type_traits/conditional.h>
#include <__type_traits/extent.h> #include <__type_traits/extent.h>
#include <__type_traits/is_same.h>
#include <__type_traits/remove_const.h> #include <__type_traits/remove_const.h>
#include <__utility/forward.h>
#include <string> #include <string>
#include <string_view> #include <string_view>
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
#if _LIBCPP_STD_VER >= 20 #if _LIBCPP_STD_VER >= 20
namespace __format { namespace __format {
▲ Show 20 Lines • Show All 231 Lines • Show Last 20 Lines

libcxx/include/__format/format_functions.h

// -*- C++ -*- // -*- C++ -*-
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#ifndef _LIBCPP___FORMAT_FORMAT_FUNCTIONS #ifndef _LIBCPP___FORMAT_FORMAT_FUNCTIONS
#define _LIBCPP___FORMAT_FORMAT_FUNCTIONS #define _LIBCPP___FORMAT_FORMAT_FUNCTIONS
#include <__algorithm/clamp.h> #include <__algorithm/clamp.h>
#include <__availability>
#include <__concepts/convertible_to.h> #include <__concepts/convertible_to.h>
#include <__concepts/same_as.h> #include <__concepts/same_as.h>
#include <__config> #include <__config>
#include <__debug> #include <__debug>
#include <__format/buffer.h> #include <__format/buffer.h>
#include <__format/format_arg.h> #include <__format/format_arg.h>
#include <__format/format_arg_store.h> #include <__format/format_arg_store.h>
#include <__format/format_args.h> #include <__format/format_args.h>
Show All 11 Lines
#include <__format/formatter_string.h> #include <__format/formatter_string.h>
#include <__format/parser_std_format_spec.h> #include <__format/parser_std_format_spec.h>
#include <__iterator/back_insert_iterator.h> #include <__iterator/back_insert_iterator.h>
#include <__iterator/concepts.h> #include <__iterator/concepts.h>
#include <__iterator/incrementable_traits.h> #include <__iterator/incrementable_traits.h>
#include <__iterator/iterator_traits.h> // iter_value_t #include <__iterator/iterator_traits.h> // iter_value_t
#include <__variant/monostate.h> #include <__variant/monostate.h>
#include <array> #include <array>
#include <string>
#include <string_view> #include <string_view>
#ifndef _LIBCPP_HAS_NO_LOCALIZATION #ifndef _LIBCPP_HAS_NO_LOCALIZATION
#include <locale> #include <locale>
#endif #endif
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header # pragma GCC system_header
▲ Show 20 Lines • Show All 611 Lines • Show Last 20 Lines

libcxx/include/__format/formatter_bool.h

Show All 9 Lines
#ifndef _LIBCPP___FORMAT_FORMATTER_BOOL_H #ifndef _LIBCPP___FORMAT_FORMATTER_BOOL_H
#define _LIBCPP___FORMAT_FORMATTER_BOOL_H #define _LIBCPP___FORMAT_FORMATTER_BOOL_H
#include <__algorithm/copy.h> #include <__algorithm/copy.h>
#include <__availability> #include <__availability>
#include <__config> #include <__config>
#include <__debug> #include <__debug>
#include <__format/concepts.h> #include <__format/concepts.h>
#include <__format/format_error.h>
#include <__format/format_parse_context.h> #include <__format/format_parse_context.h>
#include <__format/formatter.h> #include <__format/formatter.h>
#include <__format/formatter_integral.h> #include <__format/formatter_integral.h>
#include <__format/parser_std_format_spec.h> #include <__format/parser_std_format_spec.h>
#include <__utility/unreachable.h> #include <__utility/unreachable.h>
#include <string_view>
#ifndef _LIBCPP_HAS_NO_LOCALIZATION #ifndef _LIBCPP_HAS_NO_LOCALIZATION
# include <locale> # include <locale>
#endif #endif
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header # pragma GCC system_header
#endif #endif
▲ Show 20 Lines • Show All 47 Lines • Show Last 20 Lines

libcxx/include/__format/formatter_string.h

Show All 11 Lines
#include <__availability> #include <__availability>
#include <__config> #include <__config>
#include <__format/concepts.h> #include <__format/concepts.h>
#include <__format/format_parse_context.h> #include <__format/format_parse_context.h>
#include <__format/formatter.h> #include <__format/formatter.h>
#include <__format/formatter_output.h> #include <__format/formatter_output.h>
#include <__format/parser_std_format_spec.h> #include <__format/parser_std_format_spec.h>
#include <__utility/move.h>
#include <string> #include <string>
#include <string_view> #include <string_view>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header # pragma GCC system_header
#endif #endif
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
▲ Show 20 Lines • Show All 128 Lines • Show Last 20 Lines

libcxx/include/__format/formatter_tuple.h

// -*- C++ -*- // -*- C++ -*-
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#ifndef _LIBCPP___FORMAT_FORMATTER_TUPLE_H #ifndef _LIBCPP___FORMAT_FORMATTER_TUPLE_H
#define _LIBCPP___FORMAT_FORMATTER_TUPLE_H #define _LIBCPP___FORMAT_FORMATTER_TUPLE_H
#include <__algorithm/ranges_copy.h> #include <__algorithm/ranges_copy.h>
#include <__availability>
#include <__chrono/statically_widen.h> #include <__chrono/statically_widen.h>
#include <__config> #include <__config>
#include <__format/buffer.h> #include <__format/buffer.h>
#include <__format/concepts.h> #include <__format/concepts.h>
#include <__format/format_args.h>
#include <__format/format_context.h> #include <__format/format_context.h>
#include <__format/format_error.h> #include <__format/format_error.h>
#include <__format/format_parse_context.h> #include <__format/format_parse_context.h>
#include <__format/formatter.h> #include <__format/formatter.h>
#include <__format/formatter_output.h> #include <__format/formatter_output.h>
#include <__format/parser_std_format_spec.h> #include <__format/parser_std_format_spec.h>
#include <__iterator/back_insert_iterator.h>
#include <__type_traits/remove_cvref.h> #include <__type_traits/remove_cvref.h>
#include <__utility/integer_sequence.h> #include <__utility/integer_sequence.h>
#include <__utility/pair.h> #include <__utility/pair.h>
#include <string_view> #include <string_view>
#include <tuple> #include <tuple>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header # pragma GCC system_header
▲ Show 20 Lines • Show All 121 Lines • Show Last 20 Lines

libcxx/include/__format/parser_std_format_spec.h

Show All 11 Lines
/// \file Contains the std-format-spec parser. /// \file Contains the std-format-spec parser.
/// ///
/// Most of the code can be reused in the chrono-format-spec. /// Most of the code can be reused in the chrono-format-spec.
/// This header has some support for the chrono-format-spec since it doesn't /// This header has some support for the chrono-format-spec since it doesn't
/// affect the std-format-spec. /// affect the std-format-spec.
#include <__algorithm/copy_n.h> #include <__algorithm/copy_n.h>
#include <__algorithm/find_if.h>
#include <__algorithm/min.h> #include <__algorithm/min.h>
#include <__assert> #include <__assert>
#include <__concepts/arithmetic.h> #include <__concepts/arithmetic.h>
#include <__concepts/same_as.h> #include <__concepts/same_as.h>
#include <__config> #include <__config>
#include <__debug> #include <__debug>
#include <__format/format_arg.h> #include <__format/format_arg.h>
#include <__format/format_error.h> #include <__format/format_error.h>
▲ Show 20 Lines • Show All 991 Lines • Show Last 20 Lines

libcxx/include/__format/range_default_formatter.h

Show All 9 Lines
#ifndef _LIBCPP___FORMAT_RANGE_DEFAULT_FORMATTER_H #ifndef _LIBCPP___FORMAT_RANGE_DEFAULT_FORMATTER_H
#define _LIBCPP___FORMAT_RANGE_DEFAULT_FORMATTER_H #define _LIBCPP___FORMAT_RANGE_DEFAULT_FORMATTER_H
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header # pragma GCC system_header
#endif #endif
#include <__algorithm/ranges_copy.h> #include <__algorithm/ranges_copy.h>
#include <__availability>
#include <__chrono/statically_widen.h> #include <__chrono/statically_widen.h>
#include <__concepts/same_as.h> #include <__concepts/same_as.h>
#include <__config> #include <__config>
#include <__format/concepts.h> #include <__format/concepts.h>
#include <__format/formatter.h> #include <__format/formatter.h>
#include <__format/range_formatter.h> #include <__format/range_formatter.h>
#include <__iterator/back_insert_iterator.h> #include <__iterator/back_insert_iterator.h>
#include <__ranges/concepts.h> #include <__ranges/concepts.h>
#include <__ranges/data.h> #include <__ranges/data.h>
#include <__ranges/size.h> #include <__ranges/size.h>
#include <__type_traits/conditional.h>
#include <__type_traits/remove_cvref.h> #include <__type_traits/remove_cvref.h>
#include <__utility/pair.h> #include <__utility/pair.h>
#include <string_view> #include <string_view>
#include <tuple>
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
#if _LIBCPP_STD_VER >= 23 #if _LIBCPP_STD_VER >= 23
template <class _Rp, class _CharT> template <class _Rp, class _CharT>
concept __const_formattable_range = concept __const_formattable_range =
ranges::input_range<const _Rp> && formattable<ranges::range_reference_t<const _Rp>, _CharT>; ranges::input_range<const _Rp> && formattable<ranges::range_reference_t<const _Rp>, _CharT>;
▲ Show 20 Lines • Show All 180 Lines • Show Last 20 Lines

libcxx/include/__format/range_formatter.h

Show All 9 Lines
#ifndef _LIBCPP___FORMAT_RANGE_FORMATTER_H #ifndef _LIBCPP___FORMAT_RANGE_FORMATTER_H
#define _LIBCPP___FORMAT_RANGE_FORMATTER_H #define _LIBCPP___FORMAT_RANGE_FORMATTER_H
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header # pragma GCC system_header
#endif #endif
#include <__algorithm/ranges_copy.h> #include <__algorithm/ranges_copy.h>
#include <__availability>
#include <__chrono/statically_widen.h> #include <__chrono/statically_widen.h>
#include <__concepts/same_as.h> #include <__concepts/same_as.h>
#include <__config> #include <__config>
#include <__format/buffer.h> #include <__format/buffer.h>
#include <__format/concepts.h> #include <__format/concepts.h>
#include <__format/format_args.h>
#include <__format/format_context.h> #include <__format/format_context.h>
#include <__format/format_error.h> #include <__format/format_error.h>
#include <__format/formatter.h> #include <__format/formatter.h>
#include <__format/formatter_output.h> #include <__format/formatter_output.h>
#include <__format/parser_std_format_spec.h> #include <__format/parser_std_format_spec.h>
#include <__iterator/back_insert_iterator.h> #include <__iterator/back_insert_iterator.h>
#include <__ranges/concepts.h> #include <__ranges/concepts.h>
#include <__ranges/data.h> #include <__ranges/data.h>
▲ Show 20 Lines • Show All 250 Lines • Show Last 20 Lines

libcxx/include/__format/unicode.h

Show All 10 Lines
#define _LIBCPP___FORMAT_UNICODE_H #define _LIBCPP___FORMAT_UNICODE_H
#include <__assert> #include <__assert>
#include <__bit/countl.h> #include <__bit/countl.h>
#include <__concepts/same_as.h> #include <__concepts/same_as.h>
#include <__config> #include <__config>
#include <__format/extended_grapheme_cluster_table.h> #include <__format/extended_grapheme_cluster_table.h>
#include <__iterator/concepts.h> #include <__iterator/concepts.h>
#include <__iterator/iterator_traits.h> // iter_value_t #include <__iterator/readable_traits.h> // iter_value_t
#include <__type_traits/make_unsigned.h>
#include <__utility/unreachable.h>
#include <string_view> #include <string_view>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header # pragma GCC system_header
#endif #endif
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
▲ Show 20 Lines • Show All 454 Lines • Show Last 20 Lines