[llvm-branch-commits] [clang] [polly] release/18.x: [clang-format] Revert breaking stream operators to prev… (PR #89492)
https://github.com/owenca milestoned https://github.com/llvm/llvm-project/pull/89492 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] [polly] release/18.x: [clang-format] Revert breaking stream operators to prev… (PR #89492)
https://github.com/owenca created
https://github.com/llvm/llvm-project/pull/89492
…ious default (#89016)
Backport 29ecd6d50f14
>From 7fd5c11287f10fa94f58b4c7aee293d7df17b498 Mon Sep 17 00:00:00 2001
From: Owen Pan
Date: Fri, 19 Apr 2024 23:58:35 -0700
Subject: [PATCH] release/18.x: [clang-format] Revert breaking stream operators
to previous default (#89016)
Backport 29ecd6d50f14
---
clang/lib/Format/TokenAnnotator.cpp | 8 ++--
clang/unittests/Format/FormatTest.cpp | 7 +--
clang/unittests/Format/TokenAnnotatorTest.cpp | 9 -
polly/lib/Analysis/DependenceInfo.cpp | 4 ++--
polly/lib/Analysis/ScopBuilder.cpp| 7 ---
5 files changed, 9 insertions(+), 26 deletions(-)
diff --git a/clang/lib/Format/TokenAnnotator.cpp
b/clang/lib/Format/TokenAnnotator.cpp
index 4d482e6543d6f5..9c4a8381f99824 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -5157,12 +5157,8 @@ bool TokenAnnotator::mustBreakBefore(const AnnotatedLine
&Line,
return true;
if (Left.IsUnterminatedLiteral)
return true;
- // FIXME: Breaking after newlines seems useful in general. Turn this into an
- // option and recognize more cases like endl etc, and break independent of
- // what comes after operator lessless.
- if (Right.is(tok::lessless) && Right.Next &&
- Right.Next->is(tok::string_literal) && Left.is(tok::string_literal) &&
- Left.TokenText.ends_with("\\n\"")) {
+ if (Right.is(tok::lessless) && Right.Next && Left.is(tok::string_literal) &&
+ Right.Next->is(tok::string_literal)) {
return true;
}
if (Right.is(TT_RequiresClause)) {
diff --git a/clang/unittests/Format/FormatTest.cpp
b/clang/unittests/Format/FormatTest.cpp
index 0beba12dda62ae..816e58bd976db1 100644
--- a/clang/unittests/Format/FormatTest.cpp
+++ b/clang/unittests/Format/FormatTest.cpp
@@ -27019,12 +27019,6 @@ TEST_F(FormatTest, PPBranchesInBracedInit) {
"};");
}
-TEST_F(FormatTest, StreamOutputOperator) {
- verifyFormat("std::cout << \"foo\" << \"bar\" << baz;");
- verifyFormat("std::cout << \"foo\\n\"\n"
- " << \"bar\";");
-}
-
TEST_F(FormatTest, BreakAdjacentStringLiterals) {
constexpr StringRef Code{
"return \"Code\" \"\\0\\52\\26\\55\\55\\0\" \"x013\" \"\\02\\xBA\";"};
@@ -27039,6 +27033,7 @@ TEST_F(FormatTest, BreakAdjacentStringLiterals) {
Style.BreakAdjacentStringLiterals = false;
verifyFormat(Code, Style);
}
+
} // namespace
} // namespace test
} // namespace format
diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp
b/clang/unittests/Format/TokenAnnotatorTest.cpp
index c72c9384ff91d6..dea94a5c6b8356 100644
--- a/clang/unittests/Format/TokenAnnotatorTest.cpp
+++ b/clang/unittests/Format/TokenAnnotatorTest.cpp
@@ -2611,15 +2611,6 @@ TEST_F(TokenAnnotatorTest, BraceKind) {
EXPECT_BRACE_KIND(Tokens[14], BK_Block);
}
-TEST_F(TokenAnnotatorTest, StreamOperator) {
- auto Tokens = annotate("\"foo\\n\" << aux << \"foo\\n\" << \"foo\";");
- ASSERT_EQ(Tokens.size(), 9u) << Tokens;
- EXPECT_FALSE(Tokens[1]->MustBreakBefore);
- EXPECT_FALSE(Tokens[3]->MustBreakBefore);
- // Only break between string literals if the former ends with \n.
- EXPECT_TRUE(Tokens[5]->MustBreakBefore);
-}
-
} // namespace
} // namespace format
} // namespace clang
diff --git a/polly/lib/Analysis/DependenceInfo.cpp
b/polly/lib/Analysis/DependenceInfo.cpp
index 69257c603877ea..d58dc9917bc91f 100644
--- a/polly/lib/Analysis/DependenceInfo.cpp
+++ b/polly/lib/Analysis/DependenceInfo.cpp
@@ -950,8 +950,8 @@ class DependenceInfoPrinterLegacyPass final : public
ScopPass {
bool runOnScop(Scop &S) override {
DependenceInfo &P = getAnalysis();
-OS << "Printing analysis '" << P.getPassName() << "' for " << "region: '"
- << S.getRegion().getNameStr() << "' in function '"
+OS << "Printing analysis '" << P.getPassName() << "' for "
+ << "region: '" << S.getRegion().getNameStr() << "' in function '"
<< S.getFunction().getName() << "':\n";
P.printScop(OS, S);
diff --git a/polly/lib/Analysis/ScopBuilder.cpp
b/polly/lib/Analysis/ScopBuilder.cpp
index c62cb2a85c835c..64314d6041b8e9 100644
--- a/polly/lib/Analysis/ScopBuilder.cpp
+++ b/polly/lib/Analysis/ScopBuilder.cpp
@@ -2689,9 +2689,10 @@ void ScopBuilder::addUserContext() {
if (NameContext != NameUserContext) {
std::string SpaceStr = stringFromIslObj(Space, "null");
errs() << "Error: the name of dimension " << i
- << " provided in -polly-context " << "is '" << NameUserContext
- << "', but the name in the computed " << "context is '"
- << NameContext << "'. Due to this name mismatch, "
+ << " provided in -polly-context "
+ << "is '" << NameUserContext << "', but the name in the computed "
+ << "context is '" << NameContext
+ << "'. Due to this name mismatch, "
<< "the -pol
[llvm-branch-commits] [clang] [polly] release/18.x: [clang-format] Revert breaking stream operators to prev… (PR #89492)
llvmbot wrote:
@llvm/pr-subscribers-clang-format
Author: Owen Pan (owenca)
Changes
…ious default (#89016)
Backport 29ecd6d50f14
---
Full diff: https://github.com/llvm/llvm-project/pull/89492.diff
5 Files Affected:
- (modified) clang/lib/Format/TokenAnnotator.cpp (+2-6)
- (modified) clang/unittests/Format/FormatTest.cpp (+1-6)
- (modified) clang/unittests/Format/TokenAnnotatorTest.cpp (-9)
- (modified) polly/lib/Analysis/DependenceInfo.cpp (+2-2)
- (modified) polly/lib/Analysis/ScopBuilder.cpp (+4-3)
``diff
diff --git a/clang/lib/Format/TokenAnnotator.cpp
b/clang/lib/Format/TokenAnnotator.cpp
index 4d482e6543d6f5..9c4a8381f99824 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -5157,12 +5157,8 @@ bool TokenAnnotator::mustBreakBefore(const AnnotatedLine
&Line,
return true;
if (Left.IsUnterminatedLiteral)
return true;
- // FIXME: Breaking after newlines seems useful in general. Turn this into an
- // option and recognize more cases like endl etc, and break independent of
- // what comes after operator lessless.
- if (Right.is(tok::lessless) && Right.Next &&
- Right.Next->is(tok::string_literal) && Left.is(tok::string_literal) &&
- Left.TokenText.ends_with("\\n\"")) {
+ if (Right.is(tok::lessless) && Right.Next && Left.is(tok::string_literal) &&
+ Right.Next->is(tok::string_literal)) {
return true;
}
if (Right.is(TT_RequiresClause)) {
diff --git a/clang/unittests/Format/FormatTest.cpp
b/clang/unittests/Format/FormatTest.cpp
index 0beba12dda62ae..816e58bd976db1 100644
--- a/clang/unittests/Format/FormatTest.cpp
+++ b/clang/unittests/Format/FormatTest.cpp
@@ -27019,12 +27019,6 @@ TEST_F(FormatTest, PPBranchesInBracedInit) {
"};");
}
-TEST_F(FormatTest, StreamOutputOperator) {
- verifyFormat("std::cout << \"foo\" << \"bar\" << baz;");
- verifyFormat("std::cout << \"foo\\n\"\n"
- " << \"bar\";");
-}
-
TEST_F(FormatTest, BreakAdjacentStringLiterals) {
constexpr StringRef Code{
"return \"Code\" \"\\0\\52\\26\\55\\55\\0\" \"x013\" \"\\02\\xBA\";"};
@@ -27039,6 +27033,7 @@ TEST_F(FormatTest, BreakAdjacentStringLiterals) {
Style.BreakAdjacentStringLiterals = false;
verifyFormat(Code, Style);
}
+
} // namespace
} // namespace test
} // namespace format
diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp
b/clang/unittests/Format/TokenAnnotatorTest.cpp
index c72c9384ff91d6..dea94a5c6b8356 100644
--- a/clang/unittests/Format/TokenAnnotatorTest.cpp
+++ b/clang/unittests/Format/TokenAnnotatorTest.cpp
@@ -2611,15 +2611,6 @@ TEST_F(TokenAnnotatorTest, BraceKind) {
EXPECT_BRACE_KIND(Tokens[14], BK_Block);
}
-TEST_F(TokenAnnotatorTest, StreamOperator) {
- auto Tokens = annotate("\"foo\\n\" << aux << \"foo\\n\" << \"foo\";");
- ASSERT_EQ(Tokens.size(), 9u) << Tokens;
- EXPECT_FALSE(Tokens[1]->MustBreakBefore);
- EXPECT_FALSE(Tokens[3]->MustBreakBefore);
- // Only break between string literals if the former ends with \n.
- EXPECT_TRUE(Tokens[5]->MustBreakBefore);
-}
-
} // namespace
} // namespace format
} // namespace clang
diff --git a/polly/lib/Analysis/DependenceInfo.cpp
b/polly/lib/Analysis/DependenceInfo.cpp
index 69257c603877ea..d58dc9917bc91f 100644
--- a/polly/lib/Analysis/DependenceInfo.cpp
+++ b/polly/lib/Analysis/DependenceInfo.cpp
@@ -950,8 +950,8 @@ class DependenceInfoPrinterLegacyPass final : public
ScopPass {
bool runOnScop(Scop &S) override {
DependenceInfo &P = getAnalysis();
-OS << "Printing analysis '" << P.getPassName() << "' for " << "region: '"
- << S.getRegion().getNameStr() << "' in function '"
+OS << "Printing analysis '" << P.getPassName() << "' for "
+ << "region: '" << S.getRegion().getNameStr() << "' in function '"
<< S.getFunction().getName() << "':\n";
P.printScop(OS, S);
diff --git a/polly/lib/Analysis/ScopBuilder.cpp
b/polly/lib/Analysis/ScopBuilder.cpp
index c62cb2a85c835c..64314d6041b8e9 100644
--- a/polly/lib/Analysis/ScopBuilder.cpp
+++ b/polly/lib/Analysis/ScopBuilder.cpp
@@ -2689,9 +2689,10 @@ void ScopBuilder::addUserContext() {
if (NameContext != NameUserContext) {
std::string SpaceStr = stringFromIslObj(Space, "null");
errs() << "Error: the name of dimension " << i
- << " provided in -polly-context " << "is '" << NameUserContext
- << "', but the name in the computed " << "context is '"
- << NameContext << "'. Due to this name mismatch, "
+ << " provided in -polly-context "
+ << "is '" << NameUserContext << "', but the name in the computed "
+ << "context is '" << NameContext
+ << "'. Due to this name mismatch, "
<< "the -polly-context option is ignored. Please provide "
<< "the context in the parameter space: " << SpaceStr << ".\n";
return;
``
https://github.com/llvm/llvm-project/pull/89
[llvm-branch-commits] [libcxx] [libc++][TZDB] Fixes reverse time lookups. (PR #89498)
https://github.com/mordante created
https://github.com/llvm/llvm-project/pull/89498
Testing with the get_info() returning a local_info revealed some issues in the
reverse lookup. This needed an additional quirck. Also the skipping when not in
the current continuation optimization was wrong. It prevented merging two
sys_info objects.
>From 26f7f3abb6398a749810230f08c2ef4db5150e6f Mon Sep 17 00:00:00 2001
From: Mark de Wever
Date: Wed, 17 Apr 2024 21:00:22 +0200
Subject: [PATCH] [libc++][TZDB] Fixes reverse time lookups.
Testing with the get_info() returning a local_info revealed some issues in
the reverse lookup. This needed an additional quirck. Also the skipping
when not in the current continuation optimization was wrong. It prevented
merging two sys_info objects.
---
libcxx/src/time_zone.cpp | 19 -
.../get_info.sys_time.pass.cpp| 76 +++
2 files changed, 91 insertions(+), 4 deletions(-)
diff --git a/libcxx/src/time_zone.cpp b/libcxx/src/time_zone.cpp
index aef6ac674a11e6..928f3d2855e456 100644
--- a/libcxx/src/time_zone.cpp
+++ b/libcxx/src/time_zone.cpp
@@ -567,11 +567,22 @@ __first_rule(seconds __stdoff, const
vector<__tz::__rule>& __rules) {
false};
}
- __named_rule_until __continuation_end{__continuation};
- if (__time >= __continuation_end.__until() &&
!__continuation_end.__needs_adjustment())
-// note std::unexpected(__end); is ambiguous with
std::unexpected() in ,
-return __sys_info_result{std::unexpect, __continuation_end.__until()};
+ if (__rule->__save.__time != 0s) {
+// another fix for America/Punta_Arenas when not at the start of the
+// sys_info object.
+seconds __save = __rule->__save.__time;
+if (__continuation_begin >= __rule_begin - __save && __time <
__next.first) {
+ return __sys_info{
+ sys_info{__continuation_begin,
+ __next.first,
+ __continuation.__stdoff + __save,
+ chrono::duration_cast(__save),
+ chrono::__format(__continuation, __rule->__letters,
__save)},
+ false};
+}
+ }
+ __named_rule_until __continuation_end{__continuation};
while (__next.second != __rules.end()) {
#ifdef PRINT
std::print(
diff --git
a/libcxx/test/std/time/time.zone/time.zone.timezone/time.zone.members/get_info.sys_time.pass.cpp
b/libcxx/test/std/time/time.zone/time.zone.timezone/time.zone.members/get_info.sys_time.pass.cpp
index 25d2ff11d09341..1a1705d5ae59a5 100644
---
a/libcxx/test/std/time/time.zone/time.zone.timezone/time.zone.members/get_info.sys_time.pass.cpp
+++
b/libcxx/test/std/time/time.zone/time.zone.timezone/time.zone.members/get_info.sys_time.pass.cpp
@@ -1299,6 +1299,78 @@ static void test_america_indiana_knox() {
tz->get_info(to_sys_seconds(2006y, std::chrono::October, 29d,
6h, 59min, 59s)));
}
+static void test_america_punta_arenas() {
+ // Z America/Punta_Arenas -4:43:40 - LMT 1890
+ // ...
+ // -4 - -04 1919 Jul
+ // -4:42:45 - SMT 1927 S
+ // -5 x -05/-04 1932 S
+ // ...
+ //
+ // R x 1927 1931 - S 1 0 1 -
+ // R x 1928 1932 - Ap 1 0 0 -
+ // ...
+
+ using namespace std::literals::chrono_literals;
+ const std::chrono::time_zone* tz =
std::chrono::locate_zone("America/Punta_Arenas");
+
+ assert_equal(
+ std::chrono::sys_info(
+ to_sys_seconds(1927y, std::chrono::September, 1d, 4h, 42min, 45s),
+ to_sys_seconds(1928y, std::chrono::April, 1d, 4h),
+ -4h,
+ 60min,
+ "-04"),
+ tz->get_info(to_sys_seconds(1927y, std::chrono::September, 1d, 4h,
42min, 45s)));
+
+ assert_equal(
+ std::chrono::sys_info(
+ to_sys_seconds(1927y, std::chrono::September, 1d, 4h, 42min, 45s),
+ to_sys_seconds(1928y, std::chrono::April, 1d, 4h),
+ -4h,
+ 60min,
+ "-04"),
+ tz->get_info(to_sys_seconds(1928y, std::chrono::April, 1d, 3h, 59min,
59s)));
+}
+
+static void test_europ_ljubljana() {
+ // Z Europe/Ljubljana 0:58:4 - LMT 1884
+ // 1 - CET 1941 Ap 18 23
+ // 1 c CE%sT 1945 May 8 2s
+ // 1 1 CEST 1945 S 16 2s
+ // 1 - CET 1982 N 27
+ // 1 E CE%sT
+ //
+ // ...
+ // R c 1943 o - O 4 2s 0 -
+ // R c 1944 1945 - Ap M>=1 2s 1 S
+ // R c 1944 o - O 2 2s 0 -
+ // R c 1945 o - S 16 2s 0 -
+ // R c 1977 1980 - Ap Su>=1 2s 1 S
+ // ...
+
+ using namespace std::literals::chrono_literals;
+ const std::chrono::time_zone* tz =
std::chrono::locate_zone("Europe/Ljubljana");
+
+ assert_equal(
+ std::chrono::sys_info(
+ to_sys_seconds(1945y, std::chrono::April, 2d, 1h),
+ to_sys_seconds(1945y, std::chrono::September, 16d, 1h),
+ 2h,
+ 60min,
+ "CEST"),
+ tz->get_info(to_sys_seconds(1945y, std::chrono::April, 2d, 1h)));
+
+ assert_equal(
+ std::chrono::sys_info(
+ to_sys_seconds(1945y, std::chrono::April, 2d, 1h),
+ to_sys_seconds(1945y, std::chrono::September, 16
[llvm-branch-commits] [libcxx] [libc++][TZDB] Fixes reverse time lookups. (PR #89498)
llvmbot wrote:
@llvm/pr-subscribers-libcxx
Author: Mark de Wever (mordante)
Changes
Testing with the get_info() returning a local_info revealed some issues in the
reverse lookup. This needed an additional quirck. Also the skipping when not in
the current continuation optimization was wrong. It prevented merging two
sys_info objects.
---
Full diff: https://github.com/llvm/llvm-project/pull/89498.diff
2 Files Affected:
- (modified) libcxx/src/time_zone.cpp (+15-4)
- (modified)
libcxx/test/std/time/time.zone/time.zone.timezone/time.zone.members/get_info.sys_time.pass.cpp
(+76)
``diff
diff --git a/libcxx/src/time_zone.cpp b/libcxx/src/time_zone.cpp
index aef6ac674a11e6..928f3d2855e456 100644
--- a/libcxx/src/time_zone.cpp
+++ b/libcxx/src/time_zone.cpp
@@ -567,11 +567,22 @@ __first_rule(seconds __stdoff, const
vector<__tz::__rule>& __rules) {
false};
}
- __named_rule_until __continuation_end{__continuation};
- if (__time >= __continuation_end.__until() &&
!__continuation_end.__needs_adjustment())
-// note std::unexpected(__end); is ambiguous with
std::unexpected() in ,
-return __sys_info_result{std::unexpect, __continuation_end.__until()};
+ if (__rule->__save.__time != 0s) {
+// another fix for America/Punta_Arenas when not at the start of the
+// sys_info object.
+seconds __save = __rule->__save.__time;
+if (__continuation_begin >= __rule_begin - __save && __time <
__next.first) {
+ return __sys_info{
+ sys_info{__continuation_begin,
+ __next.first,
+ __continuation.__stdoff + __save,
+ chrono::duration_cast(__save),
+ chrono::__format(__continuation, __rule->__letters,
__save)},
+ false};
+}
+ }
+ __named_rule_until __continuation_end{__continuation};
while (__next.second != __rules.end()) {
#ifdef PRINT
std::print(
diff --git
a/libcxx/test/std/time/time.zone/time.zone.timezone/time.zone.members/get_info.sys_time.pass.cpp
b/libcxx/test/std/time/time.zone/time.zone.timezone/time.zone.members/get_info.sys_time.pass.cpp
index 25d2ff11d09341..1a1705d5ae59a5 100644
---
a/libcxx/test/std/time/time.zone/time.zone.timezone/time.zone.members/get_info.sys_time.pass.cpp
+++
b/libcxx/test/std/time/time.zone/time.zone.timezone/time.zone.members/get_info.sys_time.pass.cpp
@@ -1299,6 +1299,78 @@ static void test_america_indiana_knox() {
tz->get_info(to_sys_seconds(2006y, std::chrono::October, 29d,
6h, 59min, 59s)));
}
+static void test_america_punta_arenas() {
+ // Z America/Punta_Arenas -4:43:40 - LMT 1890
+ // ...
+ // -4 - -04 1919 Jul
+ // -4:42:45 - SMT 1927 S
+ // -5 x -05/-04 1932 S
+ // ...
+ //
+ // R x 1927 1931 - S 1 0 1 -
+ // R x 1928 1932 - Ap 1 0 0 -
+ // ...
+
+ using namespace std::literals::chrono_literals;
+ const std::chrono::time_zone* tz =
std::chrono::locate_zone("America/Punta_Arenas");
+
+ assert_equal(
+ std::chrono::sys_info(
+ to_sys_seconds(1927y, std::chrono::September, 1d, 4h, 42min, 45s),
+ to_sys_seconds(1928y, std::chrono::April, 1d, 4h),
+ -4h,
+ 60min,
+ "-04"),
+ tz->get_info(to_sys_seconds(1927y, std::chrono::September, 1d, 4h,
42min, 45s)));
+
+ assert_equal(
+ std::chrono::sys_info(
+ to_sys_seconds(1927y, std::chrono::September, 1d, 4h, 42min, 45s),
+ to_sys_seconds(1928y, std::chrono::April, 1d, 4h),
+ -4h,
+ 60min,
+ "-04"),
+ tz->get_info(to_sys_seconds(1928y, std::chrono::April, 1d, 3h, 59min,
59s)));
+}
+
+static void test_europ_ljubljana() {
+ // Z Europe/Ljubljana 0:58:4 - LMT 1884
+ // 1 - CET 1941 Ap 18 23
+ // 1 c CE%sT 1945 May 8 2s
+ // 1 1 CEST 1945 S 16 2s
+ // 1 - CET 1982 N 27
+ // 1 E CE%sT
+ //
+ // ...
+ // R c 1943 o - O 4 2s 0 -
+ // R c 1944 1945 - Ap M>=1 2s 1 S
+ // R c 1944 o - O 2 2s 0 -
+ // R c 1945 o - S 16 2s 0 -
+ // R c 1977 1980 - Ap Su>=1 2s 1 S
+ // ...
+
+ using namespace std::literals::chrono_literals;
+ const std::chrono::time_zone* tz =
std::chrono::locate_zone("Europe/Ljubljana");
+
+ assert_equal(
+ std::chrono::sys_info(
+ to_sys_seconds(1945y, std::chrono::April, 2d, 1h),
+ to_sys_seconds(1945y, std::chrono::September, 16d, 1h),
+ 2h,
+ 60min,
+ "CEST"),
+ tz->get_info(to_sys_seconds(1945y, std::chrono::April, 2d, 1h)));
+
+ assert_equal(
+ std::chrono::sys_info(
+ to_sys_seconds(1945y, std::chrono::April, 2d, 1h),
+ to_sys_seconds(1945y, std::chrono::September, 16d, 1h),
+ 2h,
+ 60min,
+ "CEST"),
+ tz->get_info(to_sys_seconds(1945y, std::chrono::September, 16d, 0h,
59min, 59s)));
+}
+
int main(int, const char**) {
// Basic tests
test_gmt();
@@ -1333,5 +1405,9 @@ int main(int, const char**) {
test_america_ciudad_juarez();
test_america_indiana_knox();
+ // Reverse
[llvm-branch-commits] [libcxx] [libc++][TZDB] Fixes reverse time lookups. (PR #89502)
https://github.com/mordante created
https://github.com/llvm/llvm-project/pull/89502
Testing with the get_info() returning a local_info revealed some issues in the
reverse lookup. This needed an additional quirck. Also the skipping when not in
the current continuation optimization was wrong. It prevented merging two
sys_info objects.
>From 26f7f3abb6398a749810230f08c2ef4db5150e6f Mon Sep 17 00:00:00 2001
From: Mark de Wever
Date: Wed, 17 Apr 2024 21:00:22 +0200
Subject: [PATCH] [libc++][TZDB] Fixes reverse time lookups.
Testing with the get_info() returning a local_info revealed some issues in
the reverse lookup. This needed an additional quirck. Also the skipping
when not in the current continuation optimization was wrong. It prevented
merging two sys_info objects.
---
libcxx/src/time_zone.cpp | 19 -
.../get_info.sys_time.pass.cpp| 76 +++
2 files changed, 91 insertions(+), 4 deletions(-)
diff --git a/libcxx/src/time_zone.cpp b/libcxx/src/time_zone.cpp
index aef6ac674a11e6..928f3d2855e456 100644
--- a/libcxx/src/time_zone.cpp
+++ b/libcxx/src/time_zone.cpp
@@ -567,11 +567,22 @@ __first_rule(seconds __stdoff, const
vector<__tz::__rule>& __rules) {
false};
}
- __named_rule_until __continuation_end{__continuation};
- if (__time >= __continuation_end.__until() &&
!__continuation_end.__needs_adjustment())
-// note std::unexpected(__end); is ambiguous with
std::unexpected() in ,
-return __sys_info_result{std::unexpect, __continuation_end.__until()};
+ if (__rule->__save.__time != 0s) {
+// another fix for America/Punta_Arenas when not at the start of the
+// sys_info object.
+seconds __save = __rule->__save.__time;
+if (__continuation_begin >= __rule_begin - __save && __time <
__next.first) {
+ return __sys_info{
+ sys_info{__continuation_begin,
+ __next.first,
+ __continuation.__stdoff + __save,
+ chrono::duration_cast(__save),
+ chrono::__format(__continuation, __rule->__letters,
__save)},
+ false};
+}
+ }
+ __named_rule_until __continuation_end{__continuation};
while (__next.second != __rules.end()) {
#ifdef PRINT
std::print(
diff --git
a/libcxx/test/std/time/time.zone/time.zone.timezone/time.zone.members/get_info.sys_time.pass.cpp
b/libcxx/test/std/time/time.zone/time.zone.timezone/time.zone.members/get_info.sys_time.pass.cpp
index 25d2ff11d09341..1a1705d5ae59a5 100644
---
a/libcxx/test/std/time/time.zone/time.zone.timezone/time.zone.members/get_info.sys_time.pass.cpp
+++
b/libcxx/test/std/time/time.zone/time.zone.timezone/time.zone.members/get_info.sys_time.pass.cpp
@@ -1299,6 +1299,78 @@ static void test_america_indiana_knox() {
tz->get_info(to_sys_seconds(2006y, std::chrono::October, 29d,
6h, 59min, 59s)));
}
+static void test_america_punta_arenas() {
+ // Z America/Punta_Arenas -4:43:40 - LMT 1890
+ // ...
+ // -4 - -04 1919 Jul
+ // -4:42:45 - SMT 1927 S
+ // -5 x -05/-04 1932 S
+ // ...
+ //
+ // R x 1927 1931 - S 1 0 1 -
+ // R x 1928 1932 - Ap 1 0 0 -
+ // ...
+
+ using namespace std::literals::chrono_literals;
+ const std::chrono::time_zone* tz =
std::chrono::locate_zone("America/Punta_Arenas");
+
+ assert_equal(
+ std::chrono::sys_info(
+ to_sys_seconds(1927y, std::chrono::September, 1d, 4h, 42min, 45s),
+ to_sys_seconds(1928y, std::chrono::April, 1d, 4h),
+ -4h,
+ 60min,
+ "-04"),
+ tz->get_info(to_sys_seconds(1927y, std::chrono::September, 1d, 4h,
42min, 45s)));
+
+ assert_equal(
+ std::chrono::sys_info(
+ to_sys_seconds(1927y, std::chrono::September, 1d, 4h, 42min, 45s),
+ to_sys_seconds(1928y, std::chrono::April, 1d, 4h),
+ -4h,
+ 60min,
+ "-04"),
+ tz->get_info(to_sys_seconds(1928y, std::chrono::April, 1d, 3h, 59min,
59s)));
+}
+
+static void test_europ_ljubljana() {
+ // Z Europe/Ljubljana 0:58:4 - LMT 1884
+ // 1 - CET 1941 Ap 18 23
+ // 1 c CE%sT 1945 May 8 2s
+ // 1 1 CEST 1945 S 16 2s
+ // 1 - CET 1982 N 27
+ // 1 E CE%sT
+ //
+ // ...
+ // R c 1943 o - O 4 2s 0 -
+ // R c 1944 1945 - Ap M>=1 2s 1 S
+ // R c 1944 o - O 2 2s 0 -
+ // R c 1945 o - S 16 2s 0 -
+ // R c 1977 1980 - Ap Su>=1 2s 1 S
+ // ...
+
+ using namespace std::literals::chrono_literals;
+ const std::chrono::time_zone* tz =
std::chrono::locate_zone("Europe/Ljubljana");
+
+ assert_equal(
+ std::chrono::sys_info(
+ to_sys_seconds(1945y, std::chrono::April, 2d, 1h),
+ to_sys_seconds(1945y, std::chrono::September, 16d, 1h),
+ 2h,
+ 60min,
+ "CEST"),
+ tz->get_info(to_sys_seconds(1945y, std::chrono::April, 2d, 1h)));
+
+ assert_equal(
+ std::chrono::sys_info(
+ to_sys_seconds(1945y, std::chrono::April, 2d, 1h),
+ to_sys_seconds(1945y, std::chrono::September, 16
[llvm-branch-commits] [libcxx] [libc++][TZDB] Fixes reverse time lookups. (PR #89502)
llvmbot wrote:
@llvm/pr-subscribers-libcxx
Author: Mark de Wever (mordante)
Changes
Testing with the get_info() returning a local_info revealed some issues in the
reverse lookup. This needed an additional quirck. Also the skipping when not in
the current continuation optimization was wrong. It prevented merging two
sys_info objects.
---
Full diff: https://github.com/llvm/llvm-project/pull/89502.diff
2 Files Affected:
- (modified) libcxx/src/time_zone.cpp (+15-4)
- (modified)
libcxx/test/std/time/time.zone/time.zone.timezone/time.zone.members/get_info.sys_time.pass.cpp
(+76)
``diff
diff --git a/libcxx/src/time_zone.cpp b/libcxx/src/time_zone.cpp
index aef6ac674a11e6..928f3d2855e456 100644
--- a/libcxx/src/time_zone.cpp
+++ b/libcxx/src/time_zone.cpp
@@ -567,11 +567,22 @@ __first_rule(seconds __stdoff, const
vector<__tz::__rule>& __rules) {
false};
}
- __named_rule_until __continuation_end{__continuation};
- if (__time >= __continuation_end.__until() &&
!__continuation_end.__needs_adjustment())
-// note std::unexpected(__end); is ambiguous with
std::unexpected() in ,
-return __sys_info_result{std::unexpect, __continuation_end.__until()};
+ if (__rule->__save.__time != 0s) {
+// another fix for America/Punta_Arenas when not at the start of the
+// sys_info object.
+seconds __save = __rule->__save.__time;
+if (__continuation_begin >= __rule_begin - __save && __time <
__next.first) {
+ return __sys_info{
+ sys_info{__continuation_begin,
+ __next.first,
+ __continuation.__stdoff + __save,
+ chrono::duration_cast(__save),
+ chrono::__format(__continuation, __rule->__letters,
__save)},
+ false};
+}
+ }
+ __named_rule_until __continuation_end{__continuation};
while (__next.second != __rules.end()) {
#ifdef PRINT
std::print(
diff --git
a/libcxx/test/std/time/time.zone/time.zone.timezone/time.zone.members/get_info.sys_time.pass.cpp
b/libcxx/test/std/time/time.zone/time.zone.timezone/time.zone.members/get_info.sys_time.pass.cpp
index 25d2ff11d09341..1a1705d5ae59a5 100644
---
a/libcxx/test/std/time/time.zone/time.zone.timezone/time.zone.members/get_info.sys_time.pass.cpp
+++
b/libcxx/test/std/time/time.zone/time.zone.timezone/time.zone.members/get_info.sys_time.pass.cpp
@@ -1299,6 +1299,78 @@ static void test_america_indiana_knox() {
tz->get_info(to_sys_seconds(2006y, std::chrono::October, 29d,
6h, 59min, 59s)));
}
+static void test_america_punta_arenas() {
+ // Z America/Punta_Arenas -4:43:40 - LMT 1890
+ // ...
+ // -4 - -04 1919 Jul
+ // -4:42:45 - SMT 1927 S
+ // -5 x -05/-04 1932 S
+ // ...
+ //
+ // R x 1927 1931 - S 1 0 1 -
+ // R x 1928 1932 - Ap 1 0 0 -
+ // ...
+
+ using namespace std::literals::chrono_literals;
+ const std::chrono::time_zone* tz =
std::chrono::locate_zone("America/Punta_Arenas");
+
+ assert_equal(
+ std::chrono::sys_info(
+ to_sys_seconds(1927y, std::chrono::September, 1d, 4h, 42min, 45s),
+ to_sys_seconds(1928y, std::chrono::April, 1d, 4h),
+ -4h,
+ 60min,
+ "-04"),
+ tz->get_info(to_sys_seconds(1927y, std::chrono::September, 1d, 4h,
42min, 45s)));
+
+ assert_equal(
+ std::chrono::sys_info(
+ to_sys_seconds(1927y, std::chrono::September, 1d, 4h, 42min, 45s),
+ to_sys_seconds(1928y, std::chrono::April, 1d, 4h),
+ -4h,
+ 60min,
+ "-04"),
+ tz->get_info(to_sys_seconds(1928y, std::chrono::April, 1d, 3h, 59min,
59s)));
+}
+
+static void test_europ_ljubljana() {
+ // Z Europe/Ljubljana 0:58:4 - LMT 1884
+ // 1 - CET 1941 Ap 18 23
+ // 1 c CE%sT 1945 May 8 2s
+ // 1 1 CEST 1945 S 16 2s
+ // 1 - CET 1982 N 27
+ // 1 E CE%sT
+ //
+ // ...
+ // R c 1943 o - O 4 2s 0 -
+ // R c 1944 1945 - Ap M>=1 2s 1 S
+ // R c 1944 o - O 2 2s 0 -
+ // R c 1945 o - S 16 2s 0 -
+ // R c 1977 1980 - Ap Su>=1 2s 1 S
+ // ...
+
+ using namespace std::literals::chrono_literals;
+ const std::chrono::time_zone* tz =
std::chrono::locate_zone("Europe/Ljubljana");
+
+ assert_equal(
+ std::chrono::sys_info(
+ to_sys_seconds(1945y, std::chrono::April, 2d, 1h),
+ to_sys_seconds(1945y, std::chrono::September, 16d, 1h),
+ 2h,
+ 60min,
+ "CEST"),
+ tz->get_info(to_sys_seconds(1945y, std::chrono::April, 2d, 1h)));
+
+ assert_equal(
+ std::chrono::sys_info(
+ to_sys_seconds(1945y, std::chrono::April, 2d, 1h),
+ to_sys_seconds(1945y, std::chrono::September, 16d, 1h),
+ 2h,
+ 60min,
+ "CEST"),
+ tz->get_info(to_sys_seconds(1945y, std::chrono::September, 16d, 0h,
59min, 59s)));
+}
+
int main(int, const char**) {
// Basic tests
test_gmt();
@@ -1333,5 +1405,9 @@ int main(int, const char**) {
test_america_ciudad_juarez();
test_america_indiana_knox();
+ // Reverse
[llvm-branch-commits] [libcxx] [libc++][TZDB] Fixes reverse time lookups. (PR #89498)
mordante wrote: This was not properly stacked, abandoned. https://github.com/llvm/llvm-project/pull/89498 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [libcxx] [libc++][TZDB] Fixes reverse time lookups. (PR #89498)
https://github.com/mordante closed https://github.com/llvm/llvm-project/pull/89498 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [libcxx] [libc++] Makes saturation functions privately available. (PR #89503)
https://github.com/mordante created
https://github.com/llvm/llvm-project/pull/89503
These functions are useful in the implementation of the time zone database. So
expose them with private names.
The functions could be exposed before C++ 20, but since libc++ is mostly C++ 17
complete it seems less useful to allow earlier.
>From d1f131136d005699a882bf30af9520b06fc898b4 Mon Sep 17 00:00:00 2001
From: Mark de Wever
Date: Wed, 17 Apr 2024 21:00:22 +0200
Subject: [PATCH] [libc++] Makes saturation functions privately available.
These functions are useful in the implementation of the time zone
database. So expose them with private names.
The functions could be exposed before C++ 20, but since libc++ is mostly
C++ 17 complete it seems less useful to allow earlier.
---
.../include/__numeric/saturation_arithmetic.h | 41 ---
1 file changed, 35 insertions(+), 6 deletions(-)
diff --git a/libcxx/include/__numeric/saturation_arithmetic.h
b/libcxx/include/__numeric/saturation_arithmetic.h
index 41596a0c58e27d..fd64cac935de85 100644
--- a/libcxx/include/__numeric/saturation_arithmetic.h
+++ b/libcxx/include/__numeric/saturation_arithmetic.h
@@ -25,10 +25,10 @@ _LIBCPP_PUSH_MACROS
_LIBCPP_BEGIN_NAMESPACE_STD
-#if _LIBCPP_STD_VER >= 26
+#if _LIBCPP_STD_VER >= 20
template <__libcpp_integer _Tp>
-_LIBCPP_HIDE_FROM_ABI constexpr _Tp add_sat(_Tp __x, _Tp __y) noexcept {
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp __add_sat(_Tp __x, _Tp __y) noexcept {
if (_Tp __sum; !__builtin_add_overflow(__x, __y, &__sum))
return __sum;
// Handle overflow
@@ -46,7 +46,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Tp add_sat(_Tp __x, _Tp __y)
noexcept {
}
template <__libcpp_integer _Tp>
-_LIBCPP_HIDE_FROM_ABI constexpr _Tp sub_sat(_Tp __x, _Tp __y) noexcept {
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp __sub_sat(_Tp __x, _Tp __y) noexcept {
if (_Tp __sub; !__builtin_sub_overflow(__x, __y, &__sub))
return __sub;
// Handle overflow
@@ -65,7 +65,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Tp sub_sat(_Tp __x, _Tp __y)
noexcept {
}
template <__libcpp_integer _Tp>
-_LIBCPP_HIDE_FROM_ABI constexpr _Tp mul_sat(_Tp __x, _Tp __y) noexcept {
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp __mul_sat(_Tp __x, _Tp __y) noexcept {
if (_Tp __mul; !__builtin_mul_overflow(__x, __y, &__mul))
return __mul;
// Handle overflow
@@ -81,7 +81,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Tp mul_sat(_Tp __x, _Tp __y)
noexcept {
}
template <__libcpp_integer _Tp>
-_LIBCPP_HIDE_FROM_ABI constexpr _Tp div_sat(_Tp __x, _Tp __y) noexcept {
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp __div_sat(_Tp __x, _Tp __y) noexcept {
_LIBCPP_ASSERT_UNCATEGORIZED(__y != 0, "Division by 0 is undefined");
if constexpr (__libcpp_unsigned_integer<_Tp>) {
return __x / __y;
@@ -94,7 +94,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Tp div_sat(_Tp __x, _Tp __y)
noexcept {
}
template <__libcpp_integer _Rp, __libcpp_integer _Tp>
-_LIBCPP_HIDE_FROM_ABI constexpr _Rp saturate_cast(_Tp __x) noexcept {
+_LIBCPP_HIDE_FROM_ABI constexpr _Rp __saturate_cast(_Tp __x) noexcept {
// Saturation is impossible edge case when ((min _Rp) < (min _Tp) && (max
_Rp) > (max _Tp)) and it is expected to be
// optimized out by the compiler.
@@ -107,6 +107,35 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Rp saturate_cast(_Tp __x)
noexcept {
return static_cast<_Rp>(__x);
}
+#endif // _LIBCPP_STD_VER >= 20
+
+#if _LIBCPP_STD_VER >= 26
+
+template <__libcpp_integer _Tp>
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp add_sat(_Tp __x, _Tp __y) noexcept {
+ return std::add_sat(__x, __y);
+}
+
+template <__libcpp_integer _Tp>
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp sub_sat(_Tp __x, _Tp __y) noexcept {
+ return std::sub_sat(__x, __y);
+}
+
+template <__libcpp_integer _Tp>
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp mul_sat(_Tp __x, _Tp __y) noexcept {
+ return std::mul_sat(__x, __y);
+}
+
+template <__libcpp_integer _Tp>
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp div_sat(_Tp __x, _Tp __y) noexcept {
+ return std::div_sat(__x, __y);
+}
+
+template <__libcpp_integer _Rp, __libcpp_integer _Tp>
+_LIBCPP_HIDE_FROM_ABI constexpr _Rp saturate_cast(_Tp __x) noexcept {
+ return std::saturate_cast<_Rp>(__x);
+}
+
#endif // _LIBCPP_STD_VER >= 26
_LIBCPP_END_NAMESPACE_STD
___
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [libcxx] [libc++] Makes saturation functions privately available. (PR #89503)
llvmbot wrote:
@llvm/pr-subscribers-libcxx
Author: Mark de Wever (mordante)
Changes
These functions are useful in the implementation of the time zone database. So
expose them with private names.
The functions could be exposed before C++ 20, but since libc++ is mostly C++ 17
complete it seems less useful to allow earlier.
---
Full diff: https://github.com/llvm/llvm-project/pull/89503.diff
1 Files Affected:
- (modified) libcxx/include/__numeric/saturation_arithmetic.h (+35-6)
``diff
diff --git a/libcxx/include/__numeric/saturation_arithmetic.h
b/libcxx/include/__numeric/saturation_arithmetic.h
index 41596a0c58e27d..fd64cac935de85 100644
--- a/libcxx/include/__numeric/saturation_arithmetic.h
+++ b/libcxx/include/__numeric/saturation_arithmetic.h
@@ -25,10 +25,10 @@ _LIBCPP_PUSH_MACROS
_LIBCPP_BEGIN_NAMESPACE_STD
-#if _LIBCPP_STD_VER >= 26
+#if _LIBCPP_STD_VER >= 20
template <__libcpp_integer _Tp>
-_LIBCPP_HIDE_FROM_ABI constexpr _Tp add_sat(_Tp __x, _Tp __y) noexcept {
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp __add_sat(_Tp __x, _Tp __y) noexcept {
if (_Tp __sum; !__builtin_add_overflow(__x, __y, &__sum))
return __sum;
// Handle overflow
@@ -46,7 +46,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Tp add_sat(_Tp __x, _Tp __y)
noexcept {
}
template <__libcpp_integer _Tp>
-_LIBCPP_HIDE_FROM_ABI constexpr _Tp sub_sat(_Tp __x, _Tp __y) noexcept {
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp __sub_sat(_Tp __x, _Tp __y) noexcept {
if (_Tp __sub; !__builtin_sub_overflow(__x, __y, &__sub))
return __sub;
// Handle overflow
@@ -65,7 +65,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Tp sub_sat(_Tp __x, _Tp __y)
noexcept {
}
template <__libcpp_integer _Tp>
-_LIBCPP_HIDE_FROM_ABI constexpr _Tp mul_sat(_Tp __x, _Tp __y) noexcept {
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp __mul_sat(_Tp __x, _Tp __y) noexcept {
if (_Tp __mul; !__builtin_mul_overflow(__x, __y, &__mul))
return __mul;
// Handle overflow
@@ -81,7 +81,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Tp mul_sat(_Tp __x, _Tp __y)
noexcept {
}
template <__libcpp_integer _Tp>
-_LIBCPP_HIDE_FROM_ABI constexpr _Tp div_sat(_Tp __x, _Tp __y) noexcept {
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp __div_sat(_Tp __x, _Tp __y) noexcept {
_LIBCPP_ASSERT_UNCATEGORIZED(__y != 0, "Division by 0 is undefined");
if constexpr (__libcpp_unsigned_integer<_Tp>) {
return __x / __y;
@@ -94,7 +94,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Tp div_sat(_Tp __x, _Tp __y)
noexcept {
}
template <__libcpp_integer _Rp, __libcpp_integer _Tp>
-_LIBCPP_HIDE_FROM_ABI constexpr _Rp saturate_cast(_Tp __x) noexcept {
+_LIBCPP_HIDE_FROM_ABI constexpr _Rp __saturate_cast(_Tp __x) noexcept {
// Saturation is impossible edge case when ((min _Rp) < (min _Tp) && (max
_Rp) > (max _Tp)) and it is expected to be
// optimized out by the compiler.
@@ -107,6 +107,35 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Rp saturate_cast(_Tp __x)
noexcept {
return static_cast<_Rp>(__x);
}
+#endif // _LIBCPP_STD_VER >= 20
+
+#if _LIBCPP_STD_VER >= 26
+
+template <__libcpp_integer _Tp>
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp add_sat(_Tp __x, _Tp __y) noexcept {
+ return std::add_sat(__x, __y);
+}
+
+template <__libcpp_integer _Tp>
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp sub_sat(_Tp __x, _Tp __y) noexcept {
+ return std::sub_sat(__x, __y);
+}
+
+template <__libcpp_integer _Tp>
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp mul_sat(_Tp __x, _Tp __y) noexcept {
+ return std::mul_sat(__x, __y);
+}
+
+template <__libcpp_integer _Tp>
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp div_sat(_Tp __x, _Tp __y) noexcept {
+ return std::div_sat(__x, __y);
+}
+
+template <__libcpp_integer _Rp, __libcpp_integer _Tp>
+_LIBCPP_HIDE_FROM_ABI constexpr _Rp saturate_cast(_Tp __x) noexcept {
+ return std::saturate_cast<_Rp>(__x);
+}
+
#endif // _LIBCPP_STD_VER >= 26
_LIBCPP_END_NAMESPACE_STD
``
https://github.com/llvm/llvm-project/pull/89503
___
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [libcxx] [libc++] Makes saturation functions privately available. (PR #89503)
@@ -107,6 +107,35 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Rp saturate_cast(_Tp __x)
noexcept {
return static_cast<_Rp>(__x);
}
+#endif // _LIBCPP_STD_VER >= 20
+
+#if _LIBCPP_STD_VER >= 26
+
+template <__libcpp_integer _Tp>
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp add_sat(_Tp __x, _Tp __y) noexcept {
+ return std::add_sat(__x, __y);
Zingam wrote:
```suggestion
return __add_sat(__x, __y);
```
Isn't this what you mean?
https://github.com/llvm/llvm-project/pull/89503
___
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [libcxx] [libc++] Makes saturation functions privately available. (PR #89503)
https://github.com/Zingam edited https://github.com/llvm/llvm-project/pull/89503 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [libcxx] [libc++] Makes saturation functions privately available. (PR #89503)
https://github.com/Zingam edited https://github.com/llvm/llvm-project/pull/89503 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [libcxx] [libc++] Makes saturation functions privately available. (PR #89503)
@@ -107,6 +107,35 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Rp saturate_cast(_Tp __x)
noexcept {
return static_cast<_Rp>(__x);
}
+#endif // _LIBCPP_STD_VER >= 20
+
+#if _LIBCPP_STD_VER >= 26
+
+template <__libcpp_integer _Tp>
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp add_sat(_Tp __x, _Tp __y) noexcept {
+ return std::add_sat(__x, __y);
mordante wrote:
Thanks good catch!
https://github.com/llvm/llvm-project/pull/89503
___
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [libcxx] [libc++] Makes saturation functions privately available. (PR #89503)
https://github.com/mordante updated
https://github.com/llvm/llvm-project/pull/89503
>From d1f131136d005699a882bf30af9520b06fc898b4 Mon Sep 17 00:00:00 2001
From: Mark de Wever
Date: Wed, 17 Apr 2024 21:00:22 +0200
Subject: [PATCH 1/2] [libc++] Makes saturation functions privately available.
These functions are useful in the implementation of the time zone
database. So expose them with private names.
The functions could be exposed before C++ 20, but since libc++ is mostly
C++ 17 complete it seems less useful to allow earlier.
---
.../include/__numeric/saturation_arithmetic.h | 41 ---
1 file changed, 35 insertions(+), 6 deletions(-)
diff --git a/libcxx/include/__numeric/saturation_arithmetic.h
b/libcxx/include/__numeric/saturation_arithmetic.h
index 41596a0c58e27d..fd64cac935de85 100644
--- a/libcxx/include/__numeric/saturation_arithmetic.h
+++ b/libcxx/include/__numeric/saturation_arithmetic.h
@@ -25,10 +25,10 @@ _LIBCPP_PUSH_MACROS
_LIBCPP_BEGIN_NAMESPACE_STD
-#if _LIBCPP_STD_VER >= 26
+#if _LIBCPP_STD_VER >= 20
template <__libcpp_integer _Tp>
-_LIBCPP_HIDE_FROM_ABI constexpr _Tp add_sat(_Tp __x, _Tp __y) noexcept {
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp __add_sat(_Tp __x, _Tp __y) noexcept {
if (_Tp __sum; !__builtin_add_overflow(__x, __y, &__sum))
return __sum;
// Handle overflow
@@ -46,7 +46,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Tp add_sat(_Tp __x, _Tp __y)
noexcept {
}
template <__libcpp_integer _Tp>
-_LIBCPP_HIDE_FROM_ABI constexpr _Tp sub_sat(_Tp __x, _Tp __y) noexcept {
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp __sub_sat(_Tp __x, _Tp __y) noexcept {
if (_Tp __sub; !__builtin_sub_overflow(__x, __y, &__sub))
return __sub;
// Handle overflow
@@ -65,7 +65,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Tp sub_sat(_Tp __x, _Tp __y)
noexcept {
}
template <__libcpp_integer _Tp>
-_LIBCPP_HIDE_FROM_ABI constexpr _Tp mul_sat(_Tp __x, _Tp __y) noexcept {
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp __mul_sat(_Tp __x, _Tp __y) noexcept {
if (_Tp __mul; !__builtin_mul_overflow(__x, __y, &__mul))
return __mul;
// Handle overflow
@@ -81,7 +81,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Tp mul_sat(_Tp __x, _Tp __y)
noexcept {
}
template <__libcpp_integer _Tp>
-_LIBCPP_HIDE_FROM_ABI constexpr _Tp div_sat(_Tp __x, _Tp __y) noexcept {
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp __div_sat(_Tp __x, _Tp __y) noexcept {
_LIBCPP_ASSERT_UNCATEGORIZED(__y != 0, "Division by 0 is undefined");
if constexpr (__libcpp_unsigned_integer<_Tp>) {
return __x / __y;
@@ -94,7 +94,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Tp div_sat(_Tp __x, _Tp __y)
noexcept {
}
template <__libcpp_integer _Rp, __libcpp_integer _Tp>
-_LIBCPP_HIDE_FROM_ABI constexpr _Rp saturate_cast(_Tp __x) noexcept {
+_LIBCPP_HIDE_FROM_ABI constexpr _Rp __saturate_cast(_Tp __x) noexcept {
// Saturation is impossible edge case when ((min _Rp) < (min _Tp) && (max
_Rp) > (max _Tp)) and it is expected to be
// optimized out by the compiler.
@@ -107,6 +107,35 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Rp saturate_cast(_Tp __x)
noexcept {
return static_cast<_Rp>(__x);
}
+#endif // _LIBCPP_STD_VER >= 20
+
+#if _LIBCPP_STD_VER >= 26
+
+template <__libcpp_integer _Tp>
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp add_sat(_Tp __x, _Tp __y) noexcept {
+ return std::add_sat(__x, __y);
+}
+
+template <__libcpp_integer _Tp>
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp sub_sat(_Tp __x, _Tp __y) noexcept {
+ return std::sub_sat(__x, __y);
+}
+
+template <__libcpp_integer _Tp>
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp mul_sat(_Tp __x, _Tp __y) noexcept {
+ return std::mul_sat(__x, __y);
+}
+
+template <__libcpp_integer _Tp>
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp div_sat(_Tp __x, _Tp __y) noexcept {
+ return std::div_sat(__x, __y);
+}
+
+template <__libcpp_integer _Rp, __libcpp_integer _Tp>
+_LIBCPP_HIDE_FROM_ABI constexpr _Rp saturate_cast(_Tp __x) noexcept {
+ return std::saturate_cast<_Rp>(__x);
+}
+
#endif // _LIBCPP_STD_VER >= 26
_LIBCPP_END_NAMESPACE_STD
>From 84f547d0da8721c105dea5faa9ed7eedd1e19d61 Mon Sep 17 00:00:00 2001
From: Mark de Wever
Date: Sat, 20 Apr 2024 18:35:24 +0200
Subject: [PATCH 2/2] Update libcxx/include/__numeric/saturation_arithmetic.h
Co-authored-by: Hristo Hristov
---
libcxx/include/__numeric/saturation_arithmetic.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libcxx/include/__numeric/saturation_arithmetic.h
b/libcxx/include/__numeric/saturation_arithmetic.h
index fd64cac935de85..d6c02ac224f9e2 100644
--- a/libcxx/include/__numeric/saturation_arithmetic.h
+++ b/libcxx/include/__numeric/saturation_arithmetic.h
@@ -113,7 +113,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Rp __saturate_cast(_Tp
__x) noexcept {
template <__libcpp_integer _Tp>
_LIBCPP_HIDE_FROM_ABI constexpr _Tp add_sat(_Tp __x, _Tp __y) noexcept {
- return std::add_sat(__x, __y);
+ return std::__add_sat(__x, __y);
}
template <__libcpp_integer _Tp>
___
llvm-branch-commi
[llvm-branch-commits] [libcxx] [libc++] Makes saturation functions privately available. (PR #89503)
https://github.com/mordante updated
https://github.com/llvm/llvm-project/pull/89503
>From d1f131136d005699a882bf30af9520b06fc898b4 Mon Sep 17 00:00:00 2001
From: Mark de Wever
Date: Wed, 17 Apr 2024 21:00:22 +0200
Subject: [PATCH 1/3] [libc++] Makes saturation functions privately available.
These functions are useful in the implementation of the time zone
database. So expose them with private names.
The functions could be exposed before C++ 20, but since libc++ is mostly
C++ 17 complete it seems less useful to allow earlier.
---
.../include/__numeric/saturation_arithmetic.h | 41 ---
1 file changed, 35 insertions(+), 6 deletions(-)
diff --git a/libcxx/include/__numeric/saturation_arithmetic.h
b/libcxx/include/__numeric/saturation_arithmetic.h
index 41596a0c58e27d..fd64cac935de85 100644
--- a/libcxx/include/__numeric/saturation_arithmetic.h
+++ b/libcxx/include/__numeric/saturation_arithmetic.h
@@ -25,10 +25,10 @@ _LIBCPP_PUSH_MACROS
_LIBCPP_BEGIN_NAMESPACE_STD
-#if _LIBCPP_STD_VER >= 26
+#if _LIBCPP_STD_VER >= 20
template <__libcpp_integer _Tp>
-_LIBCPP_HIDE_FROM_ABI constexpr _Tp add_sat(_Tp __x, _Tp __y) noexcept {
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp __add_sat(_Tp __x, _Tp __y) noexcept {
if (_Tp __sum; !__builtin_add_overflow(__x, __y, &__sum))
return __sum;
// Handle overflow
@@ -46,7 +46,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Tp add_sat(_Tp __x, _Tp __y)
noexcept {
}
template <__libcpp_integer _Tp>
-_LIBCPP_HIDE_FROM_ABI constexpr _Tp sub_sat(_Tp __x, _Tp __y) noexcept {
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp __sub_sat(_Tp __x, _Tp __y) noexcept {
if (_Tp __sub; !__builtin_sub_overflow(__x, __y, &__sub))
return __sub;
// Handle overflow
@@ -65,7 +65,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Tp sub_sat(_Tp __x, _Tp __y)
noexcept {
}
template <__libcpp_integer _Tp>
-_LIBCPP_HIDE_FROM_ABI constexpr _Tp mul_sat(_Tp __x, _Tp __y) noexcept {
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp __mul_sat(_Tp __x, _Tp __y) noexcept {
if (_Tp __mul; !__builtin_mul_overflow(__x, __y, &__mul))
return __mul;
// Handle overflow
@@ -81,7 +81,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Tp mul_sat(_Tp __x, _Tp __y)
noexcept {
}
template <__libcpp_integer _Tp>
-_LIBCPP_HIDE_FROM_ABI constexpr _Tp div_sat(_Tp __x, _Tp __y) noexcept {
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp __div_sat(_Tp __x, _Tp __y) noexcept {
_LIBCPP_ASSERT_UNCATEGORIZED(__y != 0, "Division by 0 is undefined");
if constexpr (__libcpp_unsigned_integer<_Tp>) {
return __x / __y;
@@ -94,7 +94,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Tp div_sat(_Tp __x, _Tp __y)
noexcept {
}
template <__libcpp_integer _Rp, __libcpp_integer _Tp>
-_LIBCPP_HIDE_FROM_ABI constexpr _Rp saturate_cast(_Tp __x) noexcept {
+_LIBCPP_HIDE_FROM_ABI constexpr _Rp __saturate_cast(_Tp __x) noexcept {
// Saturation is impossible edge case when ((min _Rp) < (min _Tp) && (max
_Rp) > (max _Tp)) and it is expected to be
// optimized out by the compiler.
@@ -107,6 +107,35 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Rp saturate_cast(_Tp __x)
noexcept {
return static_cast<_Rp>(__x);
}
+#endif // _LIBCPP_STD_VER >= 20
+
+#if _LIBCPP_STD_VER >= 26
+
+template <__libcpp_integer _Tp>
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp add_sat(_Tp __x, _Tp __y) noexcept {
+ return std::add_sat(__x, __y);
+}
+
+template <__libcpp_integer _Tp>
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp sub_sat(_Tp __x, _Tp __y) noexcept {
+ return std::sub_sat(__x, __y);
+}
+
+template <__libcpp_integer _Tp>
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp mul_sat(_Tp __x, _Tp __y) noexcept {
+ return std::mul_sat(__x, __y);
+}
+
+template <__libcpp_integer _Tp>
+_LIBCPP_HIDE_FROM_ABI constexpr _Tp div_sat(_Tp __x, _Tp __y) noexcept {
+ return std::div_sat(__x, __y);
+}
+
+template <__libcpp_integer _Rp, __libcpp_integer _Tp>
+_LIBCPP_HIDE_FROM_ABI constexpr _Rp saturate_cast(_Tp __x) noexcept {
+ return std::saturate_cast<_Rp>(__x);
+}
+
#endif // _LIBCPP_STD_VER >= 26
_LIBCPP_END_NAMESPACE_STD
>From 84f547d0da8721c105dea5faa9ed7eedd1e19d61 Mon Sep 17 00:00:00 2001
From: Mark de Wever
Date: Sat, 20 Apr 2024 18:35:24 +0200
Subject: [PATCH 2/3] Update libcxx/include/__numeric/saturation_arithmetic.h
Co-authored-by: Hristo Hristov
---
libcxx/include/__numeric/saturation_arithmetic.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libcxx/include/__numeric/saturation_arithmetic.h
b/libcxx/include/__numeric/saturation_arithmetic.h
index fd64cac935de85..d6c02ac224f9e2 100644
--- a/libcxx/include/__numeric/saturation_arithmetic.h
+++ b/libcxx/include/__numeric/saturation_arithmetic.h
@@ -113,7 +113,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Rp __saturate_cast(_Tp
__x) noexcept {
template <__libcpp_integer _Tp>
_LIBCPP_HIDE_FROM_ABI constexpr _Tp add_sat(_Tp __x, _Tp __y) noexcept {
- return std::add_sat(__x, __y);
+ return std::__add_sat(__x, __y);
}
template <__libcpp_integer _Tp>
>From 483890963a0ae405f4822b6546a3f8a096675191 Mon Sep 17 00:00:0
