[NFC][libc++][chrono] Removes dead code. #132104
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
the
libc++
|
@llvm/pr-subscribers-libcxx Author: Mark de Wever (mordante) ChangesFor certain time_points there are specializations of __convert_to_tm. This means the non-specialized version is never called. This means some of the Since there is a Full diff: https://github.com/llvm/llvm-project/pull/132104.diff 1 Files Affected:
diff --git a/libcxx/include/__chrono/convert_to_tm.h b/libcxx/include/__chrono/convert_to_tm.h
index 0a6b627726091..23cb9b6518c86 100644
--- a/libcxx/include/__chrono/convert_to_tm.h
+++ b/libcxx/include/__chrono/convert_to_tm.h
@@ -143,21 +143,14 @@ _LIBCPP_HIDE_FROM_ABI _Tm __convert_to_tm(const _ChronoT& __value) {
# endif
if constexpr (__is_time_point<_ChronoT>) {
- if constexpr (same_as<typename _ChronoT::clock, chrono::system_clock>)
- return std::__convert_to_tm<_Tm>(__value);
-# if _LIBCPP_HAS_TIME_ZONE_DATABASE && _LIBCPP_HAS_FILESYSTEM && _LIBCPP_HAS_LOCALIZATION
-# if _LIBCPP_HAS_EXPERIMENTAL_TZDB
- else if constexpr (same_as<typename _ChronoT::clock, chrono::utc_clock>)
- return std::__convert_to_tm<_Tm>(__value);
- else if constexpr (same_as<typename _ChronoT::clock, chrono::tai_clock>)
- return std::__convert_to_tm<_Tm>(__value);
-# endif // _LIBCPP_HAS_EXPERIMENTAL_TZDB
-# endif // _LIBCPP_HAS_TIME_ZONE_DATABASE && _LIBCPP_HAS_FILESYSTEM && _LIBCPP_HAS_LOCALIZATION
- else if constexpr (same_as<typename _ChronoT::clock, chrono::file_clock>)
+ if constexpr (same_as<typename _ChronoT::clock, chrono::file_clock>)
return std::__convert_to_tm<_Tm>(_ChronoT::clock::to_sys(__value));
else if constexpr (same_as<typename _ChronoT::clock, chrono::local_t>)
return std::__convert_to_tm<_Tm>(chrono::sys_time<typename _ChronoT::duration>{__value.time_since_epoch()});
else
+ // Note that some clocks have specializations __convert_to_tm for their
+ // time_point. These don't need to be added here. They do not trigger
+ // this assert.
static_assert(sizeof(_ChronoT) == 0, "TODO: Add the missing clock specialization");
} else if constexpr (chrono::__is_duration_v<_ChronoT>) {
// [time.format]/6
|
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
ldionne
approved these changes
Mar 19, 2025
Comment on lines
151
to
153
| // Note that some clocks have specializations __convert_to_tm for their | ||
| // time_point. These don't need to be added here. They do not trigger | ||
| // this assert. |
There was a problem hiding this comment.
Let's use braces with the else -- the current layout is confusing.
For certain time_points there are specializations of __convert_to_tm. This means the non-specialized version is never called. This means some of the `if constexpr` will never be true. These are removed. Since there is a `static_assert` accidental removal of the specialization will make the code ill-formed.
mordante
force-pushed
the
review/removes_dead_code
branch
from
b401d04 to
18d525b
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For certain time_points there are specializations of __convert_to_tm. This means the non-specialized version is never called. This means some of the
if constexprwill never be true. These are removed.Since there is a
static_assertaccidental removal of the specialization will make the code ill-formed.