Skip to content

Commit 118f120

Browse files
ldionneldionne
authored
[libc++] Get rid of experimental/__config (llvm#108233)
It doesn't serve much of a purpose since we can easily put its contents inside __config. Removing it simplifies the modulemap once we are trying to create a single top-level module.
1 parent bbff52b commit 118f120

21 files changed

+33
-67
lines changed

‎libcxx/include/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -925,7 +925,6 @@ set(files
925925
exception
926926
execution
927927
expected
928-
experimental/__config
929928
experimental/__simd/aligned_tag.h
930929
experimental/__simd/declaration.h
931930
experimental/__simd/reference.h

‎libcxx/include/__config

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -591,6 +591,15 @@ typedef __char32_t char32_t;
591591
inline namespace _LIBCPP_ABI_NAMESPACE {
592592
# define _LIBCPP_END_NAMESPACE_STD }} _LIBCPP_POP_EXTENSION_DIAGNOSTICS
593593

594+
#define _LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL namespace std { namespace experimental {
595+
#define _LIBCPP_END_NAMESPACE_EXPERIMENTAL }}
596+
597+
#define _LIBCPP_BEGIN_NAMESPACE_LFTS _LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL inline namespace fundamentals_v1 {
598+
#define _LIBCPP_END_NAMESPACE_LFTS } _LIBCPP_END_NAMESPACE_EXPERIMENTAL
599+
600+
#define _LIBCPP_BEGIN_NAMESPACE_LFTS_V2 _LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL inline namespace fundamentals_v2 {
601+
#define _LIBCPP_END_NAMESPACE_LFTS_V2 } _LIBCPP_END_NAMESPACE_EXPERIMENTAL
602+
594603
#ifdef _LIBCPP_ABI_NO_FILESYSTEM_INLINE_NAMESPACE
595604
# define _LIBCPP_BEGIN_NAMESPACE_FILESYSTEM _LIBCPP_BEGIN_NAMESPACE_STD namespace filesystem {
596605
# define _LIBCPP_END_NAMESPACE_FILESYSTEM } _LIBCPP_END_NAMESPACE_STD

‎libcxx/include/experimental/__config

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎libcxx/include/experimental/__simd/aligned_tag.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
#ifndef _LIBCPP_EXPERIMENTAL___SIMD_ALIGNED_TAG_H
1111
#define _LIBCPP_EXPERIMENTAL___SIMD_ALIGNED_TAG_H
1212

13+
#include <__config>
1314
#include <__memory/assume_aligned.h>
1415
#include <__type_traits/remove_const.h>
1516
#include <cstddef>
16-
#include <experimental/__config>
1717
#include <experimental/__simd/traits.h>
1818

1919
#if _LIBCPP_STD_VER >= 17 && defined(_LIBCPP_ENABLE_EXPERIMENTAL)

‎libcxx/include/experimental/__simd/declaration.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,18 @@
1010
#ifndef _LIBCPP_EXPERIMENTAL___SIMD_DECLARATION_H
1111
#define _LIBCPP_EXPERIMENTAL___SIMD_DECLARATION_H
1212

13+
#include <__config>
1314
#include <cstddef>
14-
#include <experimental/__config>
1515

1616
#if _LIBCPP_STD_VER >= 17 && defined(_LIBCPP_ENABLE_EXPERIMENTAL)
1717

18+
// TODO: support more targets
19+
# if defined(__AVX__)
20+
# define _LIBCPP_NATIVE_SIMD_WIDTH_IN_BYTES 32
21+
# else
22+
# define _LIBCPP_NATIVE_SIMD_WIDTH_IN_BYTES 16
23+
# endif
24+
1825
_LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL
1926
inline namespace parallelism_v2 {
2027
namespace simd_abi {

‎libcxx/include/experimental/__simd/reference.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
#ifndef _LIBCPP_EXPERIMENTAL___SIMD_REFERENCE_H
1111
#define _LIBCPP_EXPERIMENTAL___SIMD_REFERENCE_H
1212

13+
#include <__config>
1314
#include <__type_traits/enable_if.h>
1415
#include <__type_traits/is_assignable.h>
1516
#include <__type_traits/is_same.h>
1617
#include <__utility/declval.h>
1718
#include <__utility/forward.h>
1819
#include <__utility/move.h>
1920
#include <cstddef>
20-
#include <experimental/__config>
2121
#include <experimental/__simd/utility.h>
2222

2323
_LIBCPP_PUSH_MACROS

‎libcxx/include/experimental/__simd/scalar.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
#define _LIBCPP_EXPERIMENTAL___SIMD_SCALAR_H
1212

1313
#include <__assert>
14+
#include <__config>
1415
#include <__type_traits/integral_constant.h>
1516
#include <cstddef>
16-
#include <experimental/__config>
1717
#include <experimental/__simd/declaration.h>
1818
#include <experimental/__simd/traits.h>
1919

‎libcxx/include/experimental/__simd/simd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
#ifndef _LIBCPP_EXPERIMENTAL___SIMD_SIMD_H
1111
#define _LIBCPP_EXPERIMENTAL___SIMD_SIMD_H
1212

13+
#include <__config>
1314
#include <__type_traits/enable_if.h>
1415
#include <__type_traits/is_same.h>
1516
#include <__type_traits/remove_cvref.h>
1617
#include <__utility/forward.h>
1718
#include <cstddef>
18-
#include <experimental/__config>
1919
#include <experimental/__simd/declaration.h>
2020
#include <experimental/__simd/reference.h>
2121
#include <experimental/__simd/traits.h>

‎libcxx/include/experimental/__simd/simd_mask.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
#ifndef _LIBCPP_EXPERIMENTAL___SIMD_SIMD_MASK_H
1111
#define _LIBCPP_EXPERIMENTAL___SIMD_SIMD_MASK_H
1212

13+
#include <__config>
1314
#include <__type_traits/enable_if.h>
1415
#include <__type_traits/is_same.h>
1516
#include <cstddef>
16-
#include <experimental/__config>
1717
#include <experimental/__simd/declaration.h>
1818
#include <experimental/__simd/reference.h>
1919
#include <experimental/__simd/traits.h>

‎libcxx/include/experimental/__simd/traits.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
#define _LIBCPP_EXPERIMENTAL___SIMD_TRAITS_H
1212

1313
#include <__bit/bit_ceil.h>
14+
#include <__config>
1415
#include <__type_traits/integral_constant.h>
1516
#include <__type_traits/is_same.h>
1617
#include <cstddef>
17-
#include <experimental/__config>
1818
#include <experimental/__simd/declaration.h>
1919
#include <experimental/__simd/utility.h>
2020

‎libcxx/include/experimental/__simd/utility.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#ifndef _LIBCPP_EXPERIMENTAL___SIMD_UTILITY_H
1111
#define _LIBCPP_EXPERIMENTAL___SIMD_UTILITY_H
1212

13+
#include <__config>
1314
#include <__type_traits/is_arithmetic.h>
1415
#include <__type_traits/is_const.h>
1516
#include <__type_traits/is_constant_evaluated.h>
@@ -22,7 +23,6 @@
2223
#include <__utility/integer_sequence.h>
2324
#include <cstddef>
2425
#include <cstdint>
25-
#include <experimental/__config>
2626
#include <limits>
2727

2828
_LIBCPP_PUSH_MACROS

‎libcxx/include/experimental/__simd/vec_ext.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212

1313
#include <__assert>
1414
#include <__bit/bit_ceil.h>
15+
#include <__config>
1516
#include <__type_traits/integral_constant.h>
1617
#include <__utility/forward.h>
1718
#include <__utility/integer_sequence.h>
1819
#include <cstddef>
19-
#include <experimental/__config>
2020
#include <experimental/__simd/declaration.h>
2121
#include <experimental/__simd/traits.h>
2222
#include <experimental/__simd/utility.h>

‎libcxx/include/experimental/iterator

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ namespace std {
5252
5353
*/
5454

55+
#include <__config>
5556
#include <__memory/addressof.h>
5657
#include <__type_traits/decay.h>
5758
#include <__utility/forward.h>
5859
#include <__utility/move.h>
59-
#include <experimental/__config>
6060
#include <iterator>
6161

6262
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)

‎libcxx/include/experimental/memory

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public:
4949
}
5050
*/
5151

52+
#include <__config>
5253
#include <__functional/hash.h>
5354
#include <__functional/operations.h>
5455
#include <__type_traits/add_lvalue_reference.h>
@@ -57,7 +58,6 @@ public:
5758
#include <__type_traits/enable_if.h>
5859
#include <__type_traits/is_convertible.h>
5960
#include <cstddef>
60-
#include <experimental/__config>
6161

6262
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
6363
# pragma GCC system_header

‎libcxx/include/experimental/propagate_const

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@
107107
108108
*/
109109

110+
#include <__config>
110111
#include <__functional/operations.h>
111112
#include <__fwd/functional.h>
112113
#include <__type_traits/conditional.h>
@@ -128,7 +129,6 @@
128129
#include <__utility/move.h>
129130
#include <__utility/swap.h>
130131
#include <cstddef>
131-
#include <experimental/__config>
132132

133133
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
134134
# pragma GCC system_header

‎libcxx/include/experimental/simd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ inline namespace parallelism_v2 {
7575
# pragma GCC system_header
7676
#endif
7777

78-
#include <experimental/__config>
78+
#include <__config>
7979
#include <experimental/__simd/aligned_tag.h>
8080
#include <experimental/__simd/declaration.h>
8181
#include <experimental/__simd/reference.h>

‎libcxx/include/experimental/type_traits

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ inline namespace fundamentals_v1 {
6868
6969
*/
7070

71-
#include <experimental/__config>
71+
#include <__config>
7272

7373
#if _LIBCPP_STD_VER >= 14
7474

‎libcxx/include/experimental/utility

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ inline namespace fundamentals_v1 {
3030
3131
*/
3232

33-
#include <experimental/__config>
33+
#include <__config>
3434
#include <utility>
3535

3636
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)

‎libcxx/include/module.modulemap

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -610,10 +610,6 @@ module std_experimental [system] {
610610
header "experimental/utility"
611611
export *
612612
}
613-
module __config {
614-
textual header "experimental/__config"
615-
export *
616-
}
617613
}
618614

619615
// Convenience method to get all of the above modules in a single import statement.

‎libcxx/src/any.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace std {
1212
const char* bad_any_cast::what() const noexcept { return "bad any cast"; }
1313
} // namespace std
1414

15-
#include <experimental/__config>
15+
#include <__config>
1616

1717
// Preserve std::experimental::any_bad_cast for ABI compatibility
1818
// Even though it no longer exists in a header file

‎libcxx/src/optional.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const char* bad_optional_access::what() const noexcept { return "bad_optional_ac
1717

1818
} // namespace std
1919

20-
#include <experimental/__config>
20+
#include <__config>
2121

2222
// Preserve std::experimental::bad_optional_access for ABI compatibility
2323
// Even though it no longer exists in a header file

0 commit comments

Comments
 (0)