Skip to content

Commit 704b2a9

Browse files
author
git apple-llvm automerger
committed
Merge commit 'c1fe305052ec' from llvm.org/main into experimental/cas/main
2 parents d6499e3 + c1fe305 commit 704b2a9

File tree

102 files changed

+2163
-1107
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+2163
-1107
lines changed

‎bolt/test/X86/section-end-sym.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## Check that BOLT doesn't consider end-of-section symbols (e.g., _etext) as
22
## functions.
33

4-
# REQUIRES: system-linux, asserts
4+
# REQUIRES: x86_64-linux, asserts
55

66
# RUN: llvm-mc -filetype=obj -triple x86_64-unknown-linux %s -o %t.o
77
# RUN: ld.lld %t.o -o %t.exe -q

‎clang/include/clang/Driver/Options.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5820,7 +5820,7 @@ def experimental_assignment_tracking_EQ : Joined<["-"], "fexperimental-assignmen
58205820
Group<f_Group>, CodeGenOpts<"EnableAssignmentTracking">,
58215821
NormalizedValuesScope<"CodeGenOptions::AssignmentTrackingOpts">,
58225822
Values<"disabled,enabled,forced">, NormalizedValues<["Disabled","Enabled","Forced"]>,
5823-
MarshallingInfoEnum<CodeGenOpts<"AssignmentTrackingMode">, "Disabled">;
5823+
MarshallingInfoEnum<CodeGenOpts<"AssignmentTrackingMode">, "Enabled">;
58245824

58255825
} // let Flags = [CC1Option, NoDriverOption]
58265826

‎clang/lib/Sema/SemaAttr.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1336,6 +1336,7 @@ void Sema::ActOnPragmaFEnvAccess(SourceLocation Loc, bool IsEnabled) {
13361336
Diag(Loc, diag::err_pragma_fenv_requires_precise);
13371337
}
13381338
NewFPFeatures.setAllowFEnvAccessOverride(IsEnabled);
1339+
NewFPFeatures.setRoundingMathOverride(IsEnabled);
13391340
FpPragmaStack.Act(Loc, PSK_Set, StringRef(), NewFPFeatures);
13401341
CurFPFeatures = NewFPFeatures.applyOverrides(getLangOpts());
13411342
}

‎clang/test/CodeGen/assignment-tracking/flag.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
// RUN: -emit-llvm %s -o - -fexperimental-assignment-tracking=disabled -O1\
99
// RUN: | FileCheck %s --check-prefixes=DISABLE
1010

11-
//// Disabled by default:
11+
//// Enabled by default:
1212
// RUN: %clang_cc1 -triple x86_64-none-linux-gnu -debug-info-kind=standalone \
1313
// RUN: -emit-llvm %s -o - -O1 \
14-
// RUN: | FileCheck %s --check-prefixes=DISABLE
14+
// RUN: | FileCheck %s --check-prefixes=ENABLE
1515

1616
//// Disabled at O0 unless forced.
1717
// RUN: %clang_cc1 -triple x86_64-none-linux-gnu -debug-info-kind=standalone \

‎clang/test/CodeGen/pragma-fenv_access.c

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
// RUN: %clang_cc1 -fexperimental-strict-floating-point -ffp-exception-behavior=strict -triple %itanium_abi_triple -emit-llvm %s -o - | FileCheck --check-prefixes=CHECK,STRICT %s
2+
// RUN: %clang_cc1 -fexperimental-strict-floating-point -frounding-math -ffp-exception-behavior=strict -triple %itanium_abi_triple -emit-llvm %s -o - | FileCheck --check-prefixes=CHECK,STRICT-RND %s
23
// RUN: %clang_cc1 -fexperimental-strict-floating-point -ffp-exception-behavior=strict -triple %itanium_abi_triple -emit-llvm %s -o - -fms-extensions -DMS | FileCheck --check-prefixes=CHECK,STRICT %s
4+
// RUN: %clang_cc1 -fexperimental-strict-floating-point -frounding-math -ffp-exception-behavior=strict -triple %itanium_abi_triple -emit-llvm %s -o - -fms-extensions -DMS | FileCheck --check-prefixes=CHECK,STRICT-RND %s
35
// RUN: %clang_cc1 -fexperimental-strict-floating-point -triple %itanium_abi_triple -emit-llvm %s -o - | FileCheck --check-prefixes=CHECK,DEFAULT %s
4-
6+
// RUN: %clang_cc1 -fexperimental-strict-floating-point -frounding-math -triple %itanium_abi_triple -emit-llvm %s -o - | FileCheck --check-prefixes=CHECK,DEFAULT-RND %s
57

68
float func_00(float x, float y) {
79
return x + y;
810
}
911
// CHECK-LABEL: @func_00
1012
// STRICT: call float @llvm.experimental.constrained.fadd.f32(float {{.*}}, float {{.*}}, metadata !"round.tonearest", metadata !"fpexcept.strict")
13+
// STRICT-RND: call float @llvm.experimental.constrained.fadd.f32(float {{.*}}, float {{.*}}, metadata !"round.dynamic", metadata !"fpexcept.strict")
14+
// DEFAULT-RND: call float @llvm.experimental.constrained.fadd.f32(float {{.*}}, float {{.*}}, metadata !"round.dynamic", metadata !"fpexcept.ignore")
1115
// DEFAULT: fadd float
1216

1317

@@ -224,3 +228,17 @@ float func_18(float x, float y) {
224228
// STRICT: call float @llvm.experimental.constrained.fadd.f32(float {{.*}}, float {{.*}}, metadata !"round.tonearest", metadata !"fpexcept.strict")
225229
// DEFAULT: fadd float
226230

231+
#pragma STDC FENV_ACCESS ON
232+
float func_19(float x, float y) {
233+
return x + y;
234+
}
235+
// CHECK-LABEL: @func_19
236+
// STRICT: call float @llvm.experimental.constrained.fadd.f32(float {{.*}}, float {{.*}}, metadata !"round.dynamic", metadata !"fpexcept.strict")
237+
238+
#pragma STDC FENV_ACCESS OFF
239+
float func_20(float x, float y) {
240+
return x + y;
241+
}
242+
// CHECK-LABEL: @func_20
243+
// STRICT: call float @llvm.experimental.constrained.fadd.f32(float {{.*}}, float {{.*}}, metadata !"round.tonearest", metadata !"fpexcept.strict")
244+
// DEFAULT: fadd float

‎compiler-rt/lib/profile/InstrProfiling.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#define INSTR_PROF_VALUE_PROF_DATA
2121
#include "profile/InstrProfData.inc"
2222

23-
uint32_t __llvm_profile_global_timestamp = 1;
23+
static uint32_t __llvm_profile_global_timestamp = 1;
2424

2525
COMPILER_RT_VISIBILITY
2626
void INSTR_PROF_PROFILE_SET_TIMESTAMP(uint64_t *Probe) {

‎libcxx/include/CMakeLists.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -596,16 +596,16 @@ set(files
596596
__thread/timed_backoff_policy.h
597597
__threading_support
598598
__tree
599-
__tuple_dir/apply_cv.h
600-
__tuple_dir/make_tuple_types.h
601-
__tuple_dir/pair_like.h
602-
__tuple_dir/sfinae_helpers.h
603-
__tuple_dir/tuple_element.h
604-
__tuple_dir/tuple_indices.h
605-
__tuple_dir/tuple_like.h
606-
__tuple_dir/tuple_like_ext.h
607-
__tuple_dir/tuple_size.h
608-
__tuple_dir/tuple_types.h
599+
__tuple/apply_cv.h
600+
__tuple/make_tuple_types.h
601+
__tuple/pair_like.h
602+
__tuple/sfinae_helpers.h
603+
__tuple/tuple_element.h
604+
__tuple/tuple_indices.h
605+
__tuple/tuple_like.h
606+
__tuple/tuple_like_ext.h
607+
__tuple/tuple_size.h
608+
__tuple/tuple_types.h
609609
__type_traits/add_const.h
610610
__type_traits/add_cv.h
611611
__type_traits/add_lvalue_reference.h

‎libcxx/include/__algorithm/equal.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ template <
4646
class _Up,
4747
class _BinaryPredicate,
4848
__enable_if_t<__is_trivial_equality_predicate<_BinaryPredicate, _Tp, _Up>::value && !is_volatile<_Tp>::value &&
49-
!is_volatile<_Up>::value && __is_trivially_equality_comparable<_Tp, _Up>::value,
49+
!is_volatile<_Up>::value && __libcpp_is_trivially_equality_comparable<_Tp, _Up>::value,
5050
int> = 0>
5151
_LIBCPP_NODISCARD inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
5252
__equal_iter_impl(_Tp* __first1, _Tp* __last1, _Up* __first2, _BinaryPredicate&) {
@@ -96,7 +96,7 @@ template <class _Tp,
9696
class _Proj2,
9797
__enable_if_t<__is_trivial_equality_predicate<_Pred, _Tp, _Up>::value && __is_identity<_Proj1>::value &&
9898
__is_identity<_Proj2>::value && !is_volatile<_Tp>::value && !is_volatile<_Up>::value &&
99-
__is_trivially_equality_comparable<_Tp, _Up>::value,
99+
__libcpp_is_trivially_equality_comparable<_Tp, _Up>::value,
100100
int> = 0>
101101
_LIBCPP_NODISCARD inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool __equal_impl(
102102
_Tp* __first1, _Tp* __last1, _Up* __first2, _Up*, _Pred&, _Proj1&, _Proj2&) {

‎libcxx/include/__functional/hash.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <__functional/invoke.h>
1414
#include <__functional/unary_function.h>
1515
#include <__fwd/hash.h>
16-
#include <__tuple_dir/sfinae_helpers.h>
16+
#include <__tuple/sfinae_helpers.h>
1717
#include <__type_traits/is_copy_constructible.h>
1818
#include <__type_traits/is_default_constructible.h>
1919
#include <__type_traits/is_enum.h>

‎libcxx/include/__fwd/get.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <__fwd/pair.h>
1616
#include <__fwd/subrange.h>
1717
#include <__fwd/tuple.h>
18-
#include <__tuple_dir/tuple_element.h>
18+
#include <__tuple/tuple_element.h>
1919
#include <cstddef>
2020

2121
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)

‎libcxx/include/__memory/compressed_pair.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <__config>
1414
#include <__fwd/get.h>
1515
#include <__fwd/tuple.h>
16-
#include <__tuple_dir/tuple_indices.h>
16+
#include <__tuple/tuple_indices.h>
1717
#include <__type_traits/decay.h>
1818
#include <__type_traits/dependent_type.h>
1919
#include <__type_traits/enable_if.h>

‎libcxx/include/__ranges/elements_view.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
#include <__ranges/range_adaptor.h>
2727
#include <__ranges/size.h>
2828
#include <__ranges/view_interface.h>
29-
#include <__tuple_dir/tuple_element.h>
30-
#include <__tuple_dir/tuple_like.h>
31-
#include <__tuple_dir/tuple_size.h>
29+
#include <__tuple/tuple_element.h>
30+
#include <__tuple/tuple_like.h>
31+
#include <__tuple/tuple_size.h>
3232
#include <__type_traits/is_reference.h>
3333
#include <__type_traits/maybe_const.h>
3434
#include <__type_traits/remove_cv.h>

‎libcxx/include/__ranges/subrange.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
#include <__ranges/enable_borrowed_range.h>
3030
#include <__ranges/size.h>
3131
#include <__ranges/view_interface.h>
32-
#include <__tuple_dir/pair_like.h>
33-
#include <__tuple_dir/tuple_element.h>
34-
#include <__tuple_dir/tuple_size.h>
32+
#include <__tuple/pair_like.h>
33+
#include <__tuple/tuple_element.h>
34+
#include <__tuple/tuple_size.h>
3535
#include <__type_traits/conditional.h>
3636
#include <__type_traits/decay.h>
3737
#include <__type_traits/is_pointer.h>

‎libcxx/include/__string/constexpr_c_functions.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 size_t __constexpr_st
3838
template <class _Tp, class _Up>
3939
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 int
4040
__constexpr_memcmp(const _Tp* __lhs, const _Up* __rhs, size_t __count) {
41-
static_assert(
42-
__is_trivially_equality_comparable<_Tp, _Up>::value, "_Tp and _Up have to be trivially equality comparable");
41+
static_assert(__libcpp_is_trivially_equality_comparable<_Tp, _Up>::value,
42+
"_Tp and _Up have to be trivially equality comparable");
4343

4444
if (__libcpp_is_constant_evaluated()) {
4545
#ifdef _LIBCPP_COMPILER_CLANG_BASED

‎libcxx/include/__tuple_dir/apply_cv.h renamed to ‎libcxx/include/__tuple/apply_cv.h

File renamed without changes.

‎libcxx/include/__tuple_dir/make_tuple_types.h renamed to ‎libcxx/include/__tuple/make_tuple_types.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
#include <__config>
1313
#include <__fwd/array.h>
1414
#include <__fwd/tuple.h>
15-
#include <__tuple_dir/apply_cv.h>
16-
#include <__tuple_dir/tuple_element.h>
17-
#include <__tuple_dir/tuple_indices.h>
18-
#include <__tuple_dir/tuple_size.h>
19-
#include <__tuple_dir/tuple_types.h>
15+
#include <__tuple/apply_cv.h>
16+
#include <__tuple/tuple_element.h>
17+
#include <__tuple/tuple_indices.h>
18+
#include <__tuple/tuple_size.h>
19+
#include <__tuple/tuple_types.h>
2020
#include <__type_traits/remove_cv.h>
2121
#include <__type_traits/remove_reference.h>
2222
#include <cstddef>

‎libcxx/include/__tuple_dir/pair_like.h renamed to ‎libcxx/include/__tuple/pair_like.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#define _LIBCPP___TUPLE_PAIR_LIKE_H
1111

1212
#include <__config>
13-
#include <__tuple_dir/tuple_like.h>
14-
#include <__tuple_dir/tuple_size.h>
13+
#include <__tuple/tuple_like.h>
14+
#include <__tuple/tuple_size.h>
1515
#include <__type_traits/remove_cvref.h>
1616

1717
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)

‎libcxx/include/__tuple_dir/sfinae_helpers.h renamed to ‎libcxx/include/__tuple/sfinae_helpers.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111

1212
#include <__config>
1313
#include <__fwd/tuple.h>
14-
#include <__tuple_dir/make_tuple_types.h>
15-
#include <__tuple_dir/tuple_element.h>
16-
#include <__tuple_dir/tuple_like_ext.h>
17-
#include <__tuple_dir/tuple_size.h>
18-
#include <__tuple_dir/tuple_types.h>
14+
#include <__tuple/make_tuple_types.h>
15+
#include <__tuple/tuple_element.h>
16+
#include <__tuple/tuple_like_ext.h>
17+
#include <__tuple/tuple_size.h>
18+
#include <__tuple/tuple_types.h>
1919
#include <__type_traits/enable_if.h>
2020
#include <__type_traits/integral_constant.h>
2121
#include <__type_traits/is_assignable.h>

‎libcxx/include/__tuple_dir/tuple_element.h renamed to ‎libcxx/include/__tuple/tuple_element.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#define _LIBCPP___TUPLE_TUPLE_ELEMENT_H
1111

1212
#include <__config>
13-
#include <__tuple_dir/tuple_indices.h>
14-
#include <__tuple_dir/tuple_types.h>
13+
#include <__tuple/tuple_indices.h>
14+
#include <__tuple/tuple_types.h>
1515
#include <__type_traits/add_const.h>
1616
#include <__type_traits/add_cv.h>
1717
#include <__type_traits/add_volatile.h>

‎libcxx/include/__tuple_dir/tuple_indices.h renamed to ‎libcxx/include/__tuple/tuple_indices.h

File renamed without changes.

‎libcxx/include/__tuple_dir/tuple_like.h renamed to ‎libcxx/include/__tuple/tuple_like.h

File renamed without changes.

‎libcxx/include/__tuple_dir/tuple_like_ext.h renamed to ‎libcxx/include/__tuple/tuple_like_ext.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <__fwd/array.h>
1414
#include <__fwd/pair.h>
1515
#include <__fwd/tuple.h>
16-
#include <__tuple_dir/tuple_types.h>
16+
#include <__tuple/tuple_types.h>
1717
#include <__type_traits/integral_constant.h>
1818
#include <cstddef>
1919

‎libcxx/include/__tuple_dir/tuple_size.h renamed to ‎libcxx/include/__tuple/tuple_size.h

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

1212
#include <__config>
1313
#include <__fwd/tuple.h>
14-
#include <__tuple_dir/tuple_types.h>
14+
#include <__tuple/tuple_types.h>
1515
#include <__type_traits/is_const.h>
1616
#include <__type_traits/is_volatile.h>
1717
#include <cstddef>

‎libcxx/include/__tuple_dir/tuple_types.h renamed to ‎libcxx/include/__tuple/tuple_types.h

File renamed without changes.

‎libcxx/include/__type_traits/is_equality_comparable.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ struct __is_equality_comparable<_Tp, _Up, __void_t<decltype(std::declval<_Tp>()
4343
// always compared.
4444

4545
template <class _Tp, class _Up>
46-
struct __is_trivially_equality_comparable
46+
struct __libcpp_is_trivially_equality_comparable
4747
: integral_constant<bool,
4848
__is_equality_comparable<_Tp, _Up>::value && is_integral<_Tp>::value &&
4949
is_same<__remove_cv_t<_Tp>, __remove_cv_t<_Up> >::value> {};
5050

5151
// TODO: Use is_pointer_inverconvertible_base_of
5252
template <class _Tp, class _Up>
53-
struct __is_trivially_equality_comparable<_Tp*, _Up*>
53+
struct __libcpp_is_trivially_equality_comparable<_Tp*, _Up*>
5454
: integral_constant<
5555
bool,
5656
__is_equality_comparable<_Tp*, _Up*>::value &&

‎libcxx/include/__utility/pair.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
#include <__functional/unwrap_ref.h>
1616
#include <__fwd/get.h>
1717
#include <__fwd/tuple.h>
18-
#include <__tuple_dir/sfinae_helpers.h>
19-
#include <__tuple_dir/tuple_element.h>
20-
#include <__tuple_dir/tuple_indices.h>
21-
#include <__tuple_dir/tuple_size.h>
18+
#include <__tuple/sfinae_helpers.h>
19+
#include <__tuple/tuple_element.h>
20+
#include <__tuple/tuple_indices.h>
21+
#include <__tuple/tuple_size.h>
2222
#include <__type_traits/common_reference.h>
2323
#include <__type_traits/common_type.h>
2424
#include <__type_traits/conditional.h>

‎libcxx/include/array

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ template <size_t I, class T, size_t N> const T&& get(const array<T, N>&&) noexce
115115
#include <__assert> // all public C++ headers provide the assertion handler
116116
#include <__config>
117117
#include <__iterator/reverse_iterator.h>
118-
#include <__tuple_dir/sfinae_helpers.h>
118+
#include <__tuple/sfinae_helpers.h>
119119
#include <__type_traits/conditional.h>
120120
#include <__type_traits/is_array.h>
121121
#include <__type_traits/is_const.h>
@@ -146,8 +146,8 @@ template <size_t I, class T, size_t N> const T&& get(const array<T, N>&&) noexce
146146
#include <initializer_list>
147147

148148
// [tuple.helper]
149-
#include <__tuple_dir/tuple_element.h>
150-
#include <__tuple_dir/tuple_size.h>
149+
#include <__tuple/tuple_element.h>
150+
#include <__tuple/tuple_size.h>
151151

152152
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
153153
# pragma GCC system_header

‎libcxx/include/libcxx.imp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
{ include: [ "@<__support/.*>", "private", "<support>", "public" ] },
4343
{ include: [ "@<__system_error/.*>", "private", "<system_error>", "public" ] },
4444
{ include: [ "@<__thread/.*>", "private", "<thread>", "public" ] },
45-
{ include: [ "@<__tuple_dir/.*>", "private", "<tuple>", "public" ] },
45+
{ include: [ "@<__tuple/.*>", "private", "<tuple>", "public" ] },
4646
{ include: [ "@<__type_traits/.*>", "private", "<type_traits>", "public" ] },
4747
{ include: [ "@<__utility/.*>", "private", "<utility>", "public" ] },
4848
{ include: [ "@<__variant/.*>", "private", "<variant>", "public" ] },

‎libcxx/include/module.modulemap.in

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1467,18 +1467,18 @@ module std [system] {
14671467
header "tuple"
14681468
export *
14691469

1470-
module apply_cv { private header "__tuple_dir/apply_cv.h" }
1470+
module apply_cv { private header "__tuple/apply_cv.h" }
14711471
module get_fwd { private header "__fwd/get.h" }
1472-
module make_tuple_types { private header "__tuple_dir/make_tuple_types.h" }
1473-
module pair_like { private header "__tuple_dir/pair_like.h" }
1474-
module sfinae_helpers { private header "__tuple_dir/sfinae_helpers.h" }
1475-
module tuple_element { private header "__tuple_dir/tuple_element.h" }
1472+
module make_tuple_types { private header "__tuple/make_tuple_types.h" }
1473+
module pair_like { private header "__tuple/pair_like.h" }
1474+
module sfinae_helpers { private header "__tuple/sfinae_helpers.h" }
1475+
module tuple_element { private header "__tuple/tuple_element.h" }
14761476
module tuple_fwd { private header "__fwd/tuple.h" }
1477-
module tuple_indices { private header "__tuple_dir/tuple_indices.h" }
1478-
module tuple_like { private header "__tuple_dir/tuple_like.h" }
1479-
module tuple_like_ext { private header "__tuple_dir/tuple_like_ext.h" }
1480-
module tuple_size { private header "__tuple_dir/tuple_size.h" }
1481-
module tuple_types { private header "__tuple_dir/tuple_types.h" }
1477+
module tuple_indices { private header "__tuple/tuple_indices.h" }
1478+
module tuple_like { private header "__tuple/tuple_like.h" }
1479+
module tuple_like_ext { private header "__tuple/tuple_like_ext.h" }
1480+
module tuple_size { private header "__tuple/tuple_size.h" }
1481+
module tuple_types { private header "__tuple/tuple_types.h" }
14821482
}
14831483
module type_traits {
14841484
header "type_traits"

‎libcxx/include/optional

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ template<class T>
167167
#include <__functional/unary_function.h>
168168
#include <__memory/addressof.h>
169169
#include <__memory/construct_at.h>
170-
#include <__tuple_dir/sfinae_helpers.h>
170+
#include <__tuple/sfinae_helpers.h>
171171
#include <__type_traits/conjunction.h>
172172
#include <__type_traits/disjunction.h>
173173
#include <__type_traits/is_trivially_copy_assignable.h>

‎libcxx/include/ranges

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,8 +391,8 @@ namespace std {
391391
#include <iterator>
392392

393393
// [tuple.helper]
394-
#include <__tuple_dir/tuple_element.h>
395-
#include <__tuple_dir/tuple_size.h>
394+
#include <__tuple/tuple_element.h>
395+
#include <__tuple/tuple_size.h>
396396

397397
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
398398
# pragma GCC system_header

‎libcxx/include/utility

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,8 @@ template <class T>
272272
#include <initializer_list>
273273

274274
// [tuple.helper]
275-
#include <__tuple_dir/tuple_element.h>
276-
#include <__tuple_dir/tuple_size.h>
275+
#include <__tuple/tuple_element.h>
276+
#include <__tuple/tuple_size.h>
277277

278278
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
279279
# pragma GCC system_header

0 commit comments

Comments
 (0)