[libcxx-commits] [libcxx] 489637e - [libc++] Granularize chrono includes
Nikolas Klauser via libcxx-commits
libcxx-commits at lists.llvm.org
Wed Feb 23 14:06:39 PST 2022
Author: Nikolas Klauser
Date: 2022-02-23T23:06:26+01:00
New Revision: 489637e66dd38d29517d16da1afaee60485687d1
URL: https://github.com/llvm/llvm-project/commit/489637e66dd38d29517d16da1afaee60485687d1
DIFF: https://github.com/llvm/llvm-project/commit/489637e66dd38d29517d16da1afaee60485687d1.diff
LOG: [libc++] Granularize chrono includes
Reviewed By: Quuxplusone, #libc
Spies: libcxx-commits
Differential Revision: https://reviews.llvm.org/D120141
Added:
Modified:
libcxx/docs/ReleaseNotes.rst
libcxx/include/__filesystem/directory_entry.h
libcxx/include/__filesystem/file_time_type.h
libcxx/include/__filesystem/operations.h
libcxx/include/__mutex_base
libcxx/include/__thread/poll_with_backoff.h
libcxx/include/__thread/timed_backoff_policy.h
libcxx/include/__threading_support
libcxx/include/atomic
libcxx/include/future
libcxx/include/semaphore
libcxx/include/thread
libcxx/test/std/thread/futures/futures.async/async.pass.cpp
libcxx/test/std/thread/futures/futures.shared_future/wait.pass.cpp
libcxx/test/std/thread/futures/futures.shared_future/wait_for.pass.cpp
libcxx/test/std/thread/futures/futures.shared_future/wait_until.pass.cpp
libcxx/test/std/thread/futures/futures.unique_future/wait.pass.cpp
libcxx/test/std/thread/futures/futures.unique_future/wait_for.pass.cpp
libcxx/test/std/thread/futures/futures.unique_future/wait_until.pass.cpp
Removed:
################################################################################
diff --git a/libcxx/docs/ReleaseNotes.rst b/libcxx/docs/ReleaseNotes.rst
index 1e24ad6b3c550..ce13166782f7c 100644
--- a/libcxx/docs/ReleaseNotes.rst
+++ b/libcxx/docs/ReleaseNotes.rst
@@ -53,10 +53,10 @@ API Changes
``<filesystem>`` header. The associated macro
``_LIBCPP_DEPRECATED_EXPERIMENTAL_FILESYSTEM`` has also been removed.
-- Transitive includes of ``<algorithm>`` have been removed. If you see compiler errors
- related to missing declarations inside namespace ``std`` when updating libc++,
- you are probably missing ``#include <algorithm>`` in a file where you use algorithms.
-
+- Some libc++ headers no longer transitively include all of ``<algorithm>``and ``<chrono>``.
+ If, after updating libc++, you see compiler errors related to missing declarations in
+ namespace ``std``, it might be because one of your source files now needs to
+ ``#include <algorithm>`` and/or ``#include <chrono>``.
ABI Changes
-----------
diff --git a/libcxx/include/__filesystem/directory_entry.h b/libcxx/include/__filesystem/directory_entry.h
index a1f18add81b0c..3db244556cfd8 100644
--- a/libcxx/include/__filesystem/directory_entry.h
+++ b/libcxx/include/__filesystem/directory_entry.h
@@ -11,6 +11,7 @@
#define _LIBCPP___FILESYSTEM_DIRECTORY_ENTRY_H
#include <__availability>
+#include <__chrono/time_point.h>
#include <__config>
#include <__errc>
#include <__filesystem/file_status.h>
@@ -21,7 +22,6 @@
#include <__filesystem/path.h>
#include <__filesystem/perms.h>
#include <__utility/unreachable.h>
-#include <chrono>
#include <cstdint>
#include <cstdlib>
#include <iosfwd>
diff --git a/libcxx/include/__filesystem/file_time_type.h b/libcxx/include/__filesystem/file_time_type.h
index 620b5ec8d320c..7c4932e603bc1 100644
--- a/libcxx/include/__filesystem/file_time_type.h
+++ b/libcxx/include/__filesystem/file_time_type.h
@@ -11,8 +11,9 @@
#define _LIBCPP___FILESYSTEM_FILE_TIME_TYPE_H
#include <__availability>
+#include <__chrono/file_clock.h>
+#include <__chrono/time_point.h>
#include <__config>
-#include <chrono>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
diff --git a/libcxx/include/__filesystem/operations.h b/libcxx/include/__filesystem/operations.h
index 894c501d4ace1..85c71f017f346 100644
--- a/libcxx/include/__filesystem/operations.h
+++ b/libcxx/include/__filesystem/operations.h
@@ -11,6 +11,7 @@
#define _LIBCPP___FILESYSTEM_OPERATIONS_H
#include <__availability>
+#include <__chrono/time_point.h>
#include <__config>
#include <__filesystem/copy_options.h>
#include <__filesystem/file_status.h>
@@ -20,7 +21,6 @@
#include <__filesystem/perm_options.h>
#include <__filesystem/perms.h>
#include <__filesystem/space_info.h>
-#include <chrono>
#include <cstdint>
#include <system_error>
diff --git a/libcxx/include/__mutex_base b/libcxx/include/__mutex_base
index 78eda0882c5bb..da056b6d14237 100644
--- a/libcxx/include/__mutex_base
+++ b/libcxx/include/__mutex_base
@@ -10,9 +10,12 @@
#ifndef _LIBCPP___MUTEX_BASE
#define _LIBCPP___MUTEX_BASE
+#include <__chrono/duration.h>
+#include <__chrono/steady_clock.h>
+#include <__chrono/system_clock.h>
+#include <__chrono/time_point.h>
#include <__config>
#include <__threading_support>
-#include <chrono>
#include <ratio>
#include <system_error>
#include <time.h>
diff --git a/libcxx/include/__thread/poll_with_backoff.h b/libcxx/include/__thread/poll_with_backoff.h
index 9b084b3302314..0bbafd186657c 100644
--- a/libcxx/include/__thread/poll_with_backoff.h
+++ b/libcxx/include/__thread/poll_with_backoff.h
@@ -10,8 +10,12 @@
#define _LIBCPP___THREAD_POLL_WITH_BACKOFF_H
#include <__availability>
+#include <__chrono/duration.h>
+#include <__chrono/high_resolution_clock.h>
+#include <__chrono/steady_clock.h>
+#include <__chrono/time_point.h>
#include <__config>
-#include <chrono>
+#include <__filesystem/file_time_type.h>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
diff --git a/libcxx/include/__thread/timed_backoff_policy.h b/libcxx/include/__thread/timed_backoff_policy.h
index 58c2390bafa14..28fe75d6fd805 100644
--- a/libcxx/include/__thread/timed_backoff_policy.h
+++ b/libcxx/include/__thread/timed_backoff_policy.h
@@ -13,8 +13,8 @@
#ifndef _LIBCPP_HAS_NO_THREADS
-#include <__threading_support>
-#include <chrono>
+# include <__chrono/duration.h>
+# include <__threading_support>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
diff --git a/libcxx/include/__threading_support b/libcxx/include/__threading_support
index 11899e6b6e4a8..4f1640ab36d0c 100644
--- a/libcxx/include/__threading_support
+++ b/libcxx/include/__threading_support
@@ -11,9 +11,10 @@
#define _LIBCPP_THREADING_SUPPORT
#include <__availability>
+#include <__chrono/convert_to_timespec.h>
+#include <__chrono/duration.h>
#include <__config>
#include <__thread/poll_with_backoff.h>
-#include <chrono>
#include <errno.h>
#include <iosfwd>
#include <limits>
diff --git a/libcxx/include/atomic b/libcxx/include/atomic
index 4a5c4847dabd3..dfa01bf239f86 100644
--- a/libcxx/include/atomic
+++ b/libcxx/include/atomic
@@ -519,6 +519,7 @@ template <class T>
*/
#include <__availability>
+#include <__chrono/duration.h>
#include <__config>
#include <__thread/poll_with_backoff.h>
#include <__thread/timed_backoff_policy.h>
diff --git a/libcxx/include/future b/libcxx/include/future
index 15685dfb22cbf..fff746a93dd25 100644
--- a/libcxx/include/future
+++ b/libcxx/include/future
@@ -363,12 +363,13 @@ template <class R, class Alloc> struct uses_allocator<packaged_task<R>, Alloc>;
#include <__assert>
#include <__availability>
+#include <__chrono/duration.h>
+#include <__chrono/time_point.h>
#include <__config>
#include <__memory/allocator_arg_t.h>
#include <__memory/uses_allocator.h>
#include <__utility/auto_cast.h>
#include <__utility/forward.h>
-#include <chrono>
#include <exception>
#include <memory>
#include <mutex>
@@ -376,6 +377,8 @@ template <class R, class Alloc> struct uses_allocator<packaged_task<R>, Alloc>;
#include <thread>
#include <version>
+#include <chrono> // TODO: Remove unused header
+
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
#endif
diff --git a/libcxx/include/semaphore b/libcxx/include/semaphore
index 753d50f512667..df7b0d921e1ee 100644
--- a/libcxx/include/semaphore
+++ b/libcxx/include/semaphore
@@ -46,6 +46,7 @@ using binary_semaphore = counting_semaphore<1>;
*/
#include <__availability>
+#include <__chrono/time_point.h>
#include <__config>
#include <__thread/timed_backoff_policy.h>
#include <__threading_support>
diff --git a/libcxx/include/thread b/libcxx/include/thread
index b059cfb459905..5a8e830fcca73 100644
--- a/libcxx/include/thread
+++ b/libcxx/include/thread
@@ -89,7 +89,6 @@ void sleep_for(const chrono::duration<Rep, Period>& rel_time);
#include <__thread/timed_backoff_policy.h>
#include <__threading_support>
#include <__utility/forward.h>
-#include <chrono>
#include <cstddef>
#include <functional>
#include <iosfwd>
diff --git a/libcxx/test/std/thread/futures/futures.async/async.pass.cpp b/libcxx/test/std/thread/futures/futures.async/async.pass.cpp
index 5eded0506873e..2fdafec138f58 100644
--- a/libcxx/test/std/thread/futures/futures.async/async.pass.cpp
+++ b/libcxx/test/std/thread/futures/futures.async/async.pass.cpp
@@ -20,10 +20,11 @@
// async(launch policy, F&& f, Args&&... args);
-#include <future>
#include <atomic>
-#include <memory>
#include <cassert>
+#include <chrono>
+#include <future>
+#include <memory>
#include "test_macros.h"
diff --git a/libcxx/test/std/thread/futures/futures.shared_future/wait.pass.cpp b/libcxx/test/std/thread/futures/futures.shared_future/wait.pass.cpp
index 4be8c1bd70158..26a5f1f49f82d 100644
--- a/libcxx/test/std/thread/futures/futures.shared_future/wait.pass.cpp
+++ b/libcxx/test/std/thread/futures/futures.shared_future/wait.pass.cpp
@@ -15,8 +15,9 @@
// void wait() const;
-#include <future>
#include <cassert>
+#include <chrono>
+#include <future>
#include "make_test_thread.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/thread/futures/futures.shared_future/wait_for.pass.cpp b/libcxx/test/std/thread/futures/futures.shared_future/wait_for.pass.cpp
index d8b0ce3457bc5..44b88f38d0f0f 100644
--- a/libcxx/test/std/thread/futures/futures.shared_future/wait_for.pass.cpp
+++ b/libcxx/test/std/thread/futures/futures.shared_future/wait_for.pass.cpp
@@ -17,8 +17,9 @@
// future_status
// wait_for(const chrono::duration<Rep, Period>& rel_time) const;
-#include <future>
#include <cassert>
+#include <chrono>
+#include <future>
#include "make_test_thread.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/thread/futures/futures.shared_future/wait_until.pass.cpp b/libcxx/test/std/thread/futures/futures.shared_future/wait_until.pass.cpp
index 1d58dc25f2185..fc356dc0d7724 100644
--- a/libcxx/test/std/thread/futures/futures.shared_future/wait_until.pass.cpp
+++ b/libcxx/test/std/thread/futures/futures.shared_future/wait_until.pass.cpp
@@ -17,9 +17,10 @@
// future_status
// wait_until(const chrono::time_point<Clock, Duration>& abs_time) const;
-#include <future>
#include <atomic>
#include <cassert>
+#include <chrono>
+#include <future>
#include "make_test_thread.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/thread/futures/futures.unique_future/wait.pass.cpp b/libcxx/test/std/thread/futures/futures.unique_future/wait.pass.cpp
index 712ee3b9b4a15..2b9b0f66e1178 100644
--- a/libcxx/test/std/thread/futures/futures.unique_future/wait.pass.cpp
+++ b/libcxx/test/std/thread/futures/futures.unique_future/wait.pass.cpp
@@ -15,8 +15,9 @@
// void wait() const;
-#include <future>
#include <cassert>
+#include <chrono>
+#include <future>
#include "make_test_thread.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/thread/futures/futures.unique_future/wait_for.pass.cpp b/libcxx/test/std/thread/futures/futures.unique_future/wait_for.pass.cpp
index ff5d979e8c142..3f41bc1a81cb5 100644
--- a/libcxx/test/std/thread/futures/futures.unique_future/wait_for.pass.cpp
+++ b/libcxx/test/std/thread/futures/futures.unique_future/wait_for.pass.cpp
@@ -19,8 +19,9 @@
// future_status
// wait_for(const chrono::duration<Rep, Period>& rel_time) const;
-#include <future>
#include <cassert>
+#include <chrono>
+#include <future>
#include "make_test_thread.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/thread/futures/futures.unique_future/wait_until.pass.cpp b/libcxx/test/std/thread/futures/futures.unique_future/wait_until.pass.cpp
index e5171e5f9f1f5..d4e27d9d9761f 100644
--- a/libcxx/test/std/thread/futures/futures.unique_future/wait_until.pass.cpp
+++ b/libcxx/test/std/thread/futures/futures.unique_future/wait_until.pass.cpp
@@ -17,9 +17,10 @@
// future_status
// wait_until(const chrono::time_point<Clock, Duration>& abs_time) const;
-#include <future>
#include <atomic>
#include <cassert>
+#include <chrono>
+#include <future>
#include "make_test_thread.h"
#include "test_macros.h"
More information about the libcxx-commits
mailing list