This is an archive of the discontinued LLVM Phabricator instance.

Differential D141799

[libc++] Remove <type_traits> includes from <atomic> and <ratio>
ClosedPublic

Authored by philnik on Jan 15 2023, 10:54 AM.

Details

Reviewers
ldionne
Mordante
var-const
huixie90
Group Reviewers
Restricted Project
Commits
rGdc21ce44047a: [libc++] Remove <type_traits> includes from <atomic> and <ratio>

Diff Detail

Unit TestsFailed

TimeTest
1,500,030 mslibcxx CI Apple back-deployment macosx11.0 arm64 > apple-libc++-backdeployment-cfg-in.std/thread/thread_condition::notify_all_at_thread_exit_lwg3343.pass.cpp
1,500,040 mslibcxx CI Apple back-deployment with assertions enabled > apple-libc++-backdeployment-cfg-in.std/thread/thread_condition::notify_all_at_thread_exit_lwg3343.pass.cpp
2,990 mslibcxx CI Clang-cl (Static) > llvm-libc++-static-clangcl-cfg-in.std/thread/thread_condition/thread_condition_condvar::notify_all.pass.cpp
4,190 mslibcxx CI Clang-cl (no vcruntime exceptions) > llvm-libc++-shared-no-vcruntime-clangcl-cfg-in.std/thread/futures/futures_async::async.pass.cpp

Event Timeline

philnik created this revision.Jan 15 2023, 10:54 AM
Herald added a project: Restricted Project. · View Herald TranscriptJan 15 2023, 10:54 AM
philnik requested review of this revision.Jan 15 2023, 10:54 AM
Herald added a project: Restricted Project. · View Herald TranscriptJan 15 2023, 10:54 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
Harbormaster completed remote builds in B207924: Diff 489377.Jan 15 2023, 12:37 PM
philnik updated this revision to Diff 489395.Jan 15 2023, 2:29 PM

Try to fix CI

Harbormaster completed remote builds in B207937: Diff 489395.Jan 15 2023, 5:32 PM
Mordante accepted this revision.Jan 16 2023, 9:51 AM

LGTM, but please update the commit message to be more precise. It also removes them from <ratio> which is a public header. (I care less about the non-public chrono headers.)

This revision is now accepted and ready to land.Jan 16 2023, 9:51 AM
philnik retitled this revision from [libc++] Remove <type_traits> includes from <atomic> to [libc++] Remove <type_traits> includes from <atomic> and <ratio>.Jan 16 2023, 10:36 AM
This revision was landed with ongoing or failed builds.Jan 16 2023, 10:38 AM
Closed by commit rGdc21ce44047a: [libc++] Remove <type_traits> includes from <atomic> and <ratio> (authored by philnik). · Explain Why
This revision was automatically updated to reflect the committed changes.
philnik added a commit: rGdc21ce44047a: [libc++] Remove <type_traits> includes from <atomic> and <ratio>.

Revision Contents

PathSize
libcxx/
include/
__chrono/
9 lines
4 lines
12 lines
6 lines
test/
libcxx/
transitive_includes/
1 line
1 line
2 lines
2 lines
2 lines
8 lines
std/
atomics/
atomics.types.generic/
1 line

Diff 489395

libcxx/include/__chrono/duration.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___CHRONO_DURATION_H #ifndef _LIBCPP___CHRONO_DURATION_H
#define _LIBCPP___CHRONO_DURATION_H #define _LIBCPP___CHRONO_DURATION_H
#include <__config> #include <__config>
#include <__type_traits/common_type.h>
#include <__type_traits/enable_if.h>
#include <__type_traits/is_convertible.h>
#include <__type_traits/is_floating_point.h>
#include <limits> #include <limits>
#include <ratio> #include <ratio>
#include <type_traits>
#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_PUSH_MACROS _LIBCPP_PUSH_MACROS
#include <__undef_macros> #include <__undef_macros>
▲ Show 20 Lines • Show All 582 Lines • ▼ Show 20 Lines
} // namespace chrono } // namespace chrono
#endif // _LIBCPP_STD_VER > 11 #endif // _LIBCPP_STD_VER > 11
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS _LIBCPP_POP_MACROS
#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
# include <type_traits>
#endif
#endif // _LIBCPP___CHRONO_DURATION_H #endif // _LIBCPP___CHRONO_DURATION_H

libcxx/include/__chrono/time_point.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___CHRONO_TIME_POINT_H #ifndef _LIBCPP___CHRONO_TIME_POINT_H
#define _LIBCPP___CHRONO_TIME_POINT_H #define _LIBCPP___CHRONO_TIME_POINT_H
#include <__chrono/duration.h> #include <__chrono/duration.h>
#include <__config> #include <__config>
#include <__type_traits/common_type.h>
#include <__type_traits/enable_if.h>
#include <__type_traits/is_convertible.h>
#include <limits> #include <limits>
#include <type_traits>
#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_PUSH_MACROS _LIBCPP_PUSH_MACROS
#include <__undef_macros> #include <__undef_macros>
▲ Show 20 Lines • Show All 225 Lines • Show Last 20 Lines

libcxx/include/atomic

Show First 20 Lines • Show All 518 Lines • ▼ Show 20 Lines
*/ */
#include <__assert> // all public C++ headers provide the assertion handler #include <__assert> // all public C++ headers provide the assertion handler
#include <__availability> #include <__availability>
#include <__chrono/duration.h> #include <__chrono/duration.h>
#include <__config> #include <__config>
#include <__thread/poll_with_backoff.h> #include <__thread/poll_with_backoff.h>
#include <__thread/timed_backoff_policy.h> #include <__thread/timed_backoff_policy.h>
#include <__type_traits/conditional.h>
#include <__type_traits/decay.h>
#include <__type_traits/is_assignable.h>
#include <__type_traits/is_function.h>
#include <__type_traits/is_nothrow_default_constructible.h>
#include <__type_traits/is_same.h>
#include <__type_traits/is_trivially_copyable.h>
#include <__type_traits/remove_const.h>
#include <__type_traits/remove_pointer.h>
#include <__type_traits/underlying_type.h>
#include <cstddef> #include <cstddef>
#include <cstdint> #include <cstdint>
#include <cstring> #include <cstring>
#include <type_traits>
#include <version> #include <version>
#ifndef _LIBCPP_HAS_NO_THREADS #ifndef _LIBCPP_HAS_NO_THREADS
# include <__threading_support> # include <__threading_support>
#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 2,114 Lines • ▼ Show 20 Lines
# endif # endif
#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_DISABLE_DEPRECATION_WARNINGS) #endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_DISABLE_DEPRECATION_WARNINGS)
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
# include <cmath> # include <cmath>
# include <compare> # include <compare>
# include <type_traits>
#endif #endif
#endif // _LIBCPP_ATOMIC #endif // _LIBCPP_ATOMIC

libcxx/include/ratio

Show First 20 Lines • Show All 73 Lines • ▼ Show 20 Lines template <class R1, class R2> inline constexpr bool ratio_greater_v
= ratio_greater<R1, R2>::value; // C++17 = ratio_greater<R1, R2>::value; // C++17
template <class R1, class R2> inline constexpr bool ratio_greater_equal_v template <class R1, class R2> inline constexpr bool ratio_greater_equal_v
= ratio_greater_equal<R1, R2>::value; // C++17 = ratio_greater_equal<R1, R2>::value; // C++17
} }
*/ */
#include <__assert> // all public C++ headers provide the assertion handler #include <__assert> // all public C++ headers provide the assertion handler
#include <__config> #include <__config>
#include <__type_traits/integral_constant.h>
#include <climits> #include <climits>
#include <cstdint> #include <cstdint>
#include <type_traits>
#include <version> #include <version>
#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_PUSH_MACROS _LIBCPP_PUSH_MACROS
#include <__undef_macros> #include <__undef_macros>
▲ Show 20 Lines • Show All 427 Lines • ▼ Show 20 Lines
template <class _R1, class _R2> template <class _R1, class _R2>
inline constexpr bool ratio_greater_equal_v = ratio_greater_equal<_R1, _R2>::value; inline constexpr bool ratio_greater_equal_v = ratio_greater_equal<_R1, _R2>::value;
#endif #endif
_LIBCPP_END_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS _LIBCPP_POP_MACROS
#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
# include <type_traits>
#endif
#endif // _LIBCPP_RATIO #endif // _LIBCPP_RATIO

libcxx/test/libcxx/transitive_includes/cxx03.csv

Show First 20 Lines • Show All 716 Lines • ▼ Show 20 Lines
scoped_allocator new scoped_allocator new
scoped_allocator ratio scoped_allocator ratio
scoped_allocator stdexcept scoped_allocator stdexcept
scoped_allocator tuple scoped_allocator tuple
scoped_allocator type_traits scoped_allocator type_traits
scoped_allocator variant scoped_allocator variant
scoped_allocator version scoped_allocator version
semaphore atomic semaphore atomic
semaphore cstddef
semaphore ctime semaphore ctime
semaphore iosfwd semaphore iosfwd
semaphore limits semaphore limits
semaphore ratio semaphore ratio
semaphore type_traits semaphore type_traits
semaphore version semaphore version
set compare set compare
set concepts set concepts
▲ Show 20 Lines • Show All 225 Lines • Show Last 20 Lines

libcxx/test/libcxx/transitive_includes/cxx11.csv

Show First 20 Lines • Show All 717 Lines • ▼ Show 20 Lines
scoped_allocator new scoped_allocator new
scoped_allocator ratio scoped_allocator ratio
scoped_allocator stdexcept scoped_allocator stdexcept
scoped_allocator tuple scoped_allocator tuple
scoped_allocator type_traits scoped_allocator type_traits
scoped_allocator variant scoped_allocator variant
scoped_allocator version scoped_allocator version
semaphore atomic semaphore atomic
semaphore cstddef
semaphore ctime semaphore ctime
semaphore iosfwd semaphore iosfwd
semaphore limits semaphore limits
semaphore ratio semaphore ratio
semaphore type_traits semaphore type_traits
semaphore version semaphore version
set compare set compare
set concepts set concepts
▲ Show 20 Lines • Show All 225 Lines • Show Last 20 Lines

libcxx/test/libcxx/transitive_includes/cxx14.csv

Show First 20 Lines • Show All 719 Lines • ▼ Show 20 Lines
scoped_allocator new scoped_allocator new
scoped_allocator ratio scoped_allocator ratio
scoped_allocator stdexcept scoped_allocator stdexcept
scoped_allocator tuple scoped_allocator tuple
scoped_allocator type_traits scoped_allocator type_traits
scoped_allocator variant scoped_allocator variant
scoped_allocator version scoped_allocator version
semaphore atomic semaphore atomic
semaphore cstddef
semaphore ctime semaphore ctime
semaphore iosfwd semaphore iosfwd
semaphore limits semaphore limits
semaphore ratio semaphore ratio
semaphore type_traits semaphore type_traits
semaphore version semaphore version
set compare set compare
set concepts set concepts
set cstddef set cstddef
set cstdlib set cstdlib
set functional set functional
set initializer_list set initializer_list
set iterator set iterator
set limits set limits
set new set new
set optional set optional
set stdexcept set stdexcept
set tuple set tuple
set type_traits set type_traits
set version set version
shared_mutex cstddef
shared_mutex ctime shared_mutex ctime
shared_mutex iosfwd shared_mutex iosfwd
shared_mutex limits shared_mutex limits
shared_mutex ratio shared_mutex ratio
shared_mutex system_error shared_mutex system_error
shared_mutex type_traits shared_mutex type_traits
shared_mutex version shared_mutex version
source_location cstdint source_location cstdint
▲ Show 20 Lines • Show All 211 Lines • Show Last 20 Lines

libcxx/test/libcxx/transitive_includes/cxx17.csv

Show First 20 Lines • Show All 719 Lines • ▼ Show 20 Lines
scoped_allocator new scoped_allocator new
scoped_allocator ratio scoped_allocator ratio
scoped_allocator stdexcept scoped_allocator stdexcept
scoped_allocator tuple scoped_allocator tuple
scoped_allocator type_traits scoped_allocator type_traits
scoped_allocator variant scoped_allocator variant
scoped_allocator version scoped_allocator version
semaphore atomic semaphore atomic
semaphore cstddef
semaphore ctime semaphore ctime
semaphore iosfwd semaphore iosfwd
semaphore limits semaphore limits
semaphore ratio semaphore ratio
semaphore type_traits semaphore type_traits
semaphore version semaphore version
set compare set compare
set concepts set concepts
set cstddef set cstddef
set cstdlib set cstdlib
set functional set functional
set initializer_list set initializer_list
set iterator set iterator
set limits set limits
set new set new
set optional set optional
set stdexcept set stdexcept
set tuple set tuple
set type_traits set type_traits
set version set version
shared_mutex cstddef
shared_mutex ctime shared_mutex ctime
shared_mutex iosfwd shared_mutex iosfwd
shared_mutex limits shared_mutex limits
shared_mutex ratio shared_mutex ratio
shared_mutex system_error shared_mutex system_error
shared_mutex type_traits shared_mutex type_traits
shared_mutex version shared_mutex version
source_location cstdint source_location cstdint
▲ Show 20 Lines • Show All 211 Lines • Show Last 20 Lines

libcxx/test/libcxx/transitive_includes/cxx20.csv

Show First 20 Lines • Show All 726 Lines • ▼ Show 20 Lines
scoped_allocator new scoped_allocator new
scoped_allocator ratio scoped_allocator ratio
scoped_allocator stdexcept scoped_allocator stdexcept
scoped_allocator tuple scoped_allocator tuple
scoped_allocator type_traits scoped_allocator type_traits
scoped_allocator variant scoped_allocator variant
scoped_allocator version scoped_allocator version
semaphore atomic semaphore atomic
semaphore cstddef
semaphore ctime semaphore ctime
semaphore iosfwd semaphore iosfwd
semaphore limits semaphore limits
semaphore ratio semaphore ratio
semaphore type_traits semaphore type_traits
semaphore version semaphore version
set compare set compare
set concepts set concepts
set cstddef set cstddef
set cstdlib set cstdlib
set functional set functional
set initializer_list set initializer_list
set iterator set iterator
set limits set limits
set new set new
set optional set optional
set stdexcept set stdexcept
set tuple set tuple
set type_traits set type_traits
set version set version
shared_mutex cstddef
shared_mutex ctime shared_mutex ctime
shared_mutex iosfwd shared_mutex iosfwd
shared_mutex limits shared_mutex limits
shared_mutex ratio shared_mutex ratio
shared_mutex system_error shared_mutex system_error
shared_mutex type_traits shared_mutex type_traits
shared_mutex version shared_mutex version
source_location cstdint source_location cstdint
▲ Show 20 Lines • Show All 210 Lines • Show Last 20 Lines

libcxx/test/libcxx/transitive_includes/cxx2b.csv

Show All 30 Lines
array version array version
atomic cstddef atomic cstddef
atomic cstdint atomic cstdint
atomic cstring atomic cstring
atomic ctime atomic ctime
atomic iosfwd atomic iosfwd
atomic limits atomic limits
atomic ratio atomic ratio
atomic type_traits
atomic version atomic version
barrier atomic barrier atomic
barrier cstddef barrier cstddef
barrier cstdint barrier cstdint
barrier cstring barrier cstring
barrier ctime barrier ctime
barrier iosfwd barrier iosfwd
barrier limits barrier limits
barrier new barrier new
barrier ratio barrier ratio
barrier type_traits
bit cstdint bit cstdint
bit cstdlib bit cstdlib
bit limits bit limits
bit version bit version
bitset climits bitset climits
bitset cstddef bitset cstddef
bitset cstdint bitset cstdint
bitset cstdlib bitset cstdlib
▲ Show 20 Lines • Show All 269 Lines • ▼ Show 20 Lines
future cstddef future cstddef
future exception future exception
future limits future limits
future mutex future mutex
future new future new
future ratio future ratio
future system_error future system_error
future thread future thread
future type_traits
future version future version
initializer_list cstddef initializer_list cstddef
iomanip istream iomanip istream
iomanip version iomanip version
ios atomic ios atomic
ios cctype ios cctype
ios cstddef ios cstddef
ios cstdint ios cstdint
▲ Show 20 Lines • Show All 172 Lines • ▼ Show 20 Lines
ranges optional ranges optional
ranges span ranges span
ranges tuple ranges tuple
ranges type_traits ranges type_traits
ranges variant ranges variant
ranges version ranges version
ratio climits ratio climits
ratio cstdint ratio cstdint
ratio type_traits
ratio version ratio version
regex cctype regex cctype
regex compare regex compare
regex cstddef regex cstddef
regex cstdint regex cstdint
regex cstdlib regex cstdlib
regex cstring regex cstring
regex deque regex deque
regex initializer_list regex initializer_list
regex limits regex limits
regex mutex regex mutex
regex stdexcept regex stdexcept
regex string regex string
regex type_traits regex type_traits
regex vector regex vector
regex version regex version
scoped_allocator cstddef scoped_allocator cstddef
scoped_allocator limits scoped_allocator limits
scoped_allocator new scoped_allocator new
scoped_allocator tuple scoped_allocator tuple
scoped_allocator version scoped_allocator version
semaphore atomic semaphore atomic
semaphore cstddef
semaphore ctime semaphore ctime
semaphore iosfwd semaphore iosfwd
semaphore limits semaphore limits
semaphore ratio semaphore ratio
semaphore type_traits
semaphore version semaphore version
set compare set compare
set cstddef set cstddef
set cstdlib set cstdlib
set initializer_list set initializer_list
set limits set limits
set new set new
set optional set optional
set stdexcept set stdexcept
set tuple set tuple
set type_traits set type_traits
set version set version
shared_mutex cstddef
shared_mutex ctime shared_mutex ctime
shared_mutex iosfwd shared_mutex iosfwd
shared_mutex limits shared_mutex limits
shared_mutex ratio shared_mutex ratio
shared_mutex system_error shared_mutex system_error
shared_mutex type_traits
shared_mutex version shared_mutex version
source_location cstdint source_location cstdint
source_location version source_location version
span array span array
span cstddef span cstddef
span initializer_list span initializer_list
span limits span limits
span type_traits span type_traits
▲ Show 20 Lines • Show All 155 Lines • Show Last 20 Lines

libcxx/test/std/atomics/atomics.types.generic/constexpr_noexcept.compile.pass.cpp

//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// 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
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// UNSUPPORTED: c++03, c++11, c++14, c++17 // UNSUPPORTED: c++03, c++11, c++14, c++17
#include <atomic> #include <atomic>
#include <type_traits>
#include "test_macros.h" #include "test_macros.h"
template <typename T> template <typename T>
constexpr bool test() { constexpr bool test() {
[[maybe_unused]] constexpr T a; [[maybe_unused]] constexpr T a;
static_assert(std::is_nothrow_constructible_v<T>); static_assert(std::is_nothrow_constructible_v<T>);
ASSERT_NOEXCEPT(T{}); ASSERT_NOEXCEPT(T{});
Show All 21 Lines