[libc++][concepts] Implements concept helper `__libcpp_integer` #78086

H-G-Hristov · 2024-01-14T07:35:14Z

...and tests.

llvmbot · 2024-01-14T07:35:42Z

@llvm/pr-subscribers-libcxx

Author: Hristo Hristov (H-G-Hristov)

Changes

...and tests.

Full diff: https://github.com/llvm/llvm-project/pull/78086.diff

2 Files Affected:

(modified) libcxx/include/__concepts/arithmetic.h (+4)
(added) libcxx/test/libcxx/concepts/concepts.arithmetic/arithmetic.compile.pass.cpp (+118)

diff --git a/libcxx/include/__concepts/arithmetic.h b/libcxx/include/__concepts/arithmetic.h
index f41e4c9f2747cc..0c44f117805f36 100644
--- a/libcxx/include/__concepts/arithmetic.h
+++ b/libcxx/include/__concepts/arithmetic.h
@@ -42,9 +42,13 @@ concept floating_point = is_floating_point_v<_Tp>;
 
 template <class _Tp>
 concept __libcpp_unsigned_integer = __libcpp_is_unsigned_integer<_Tp>::value;
+
 template <class _Tp>
 concept __libcpp_signed_integer = __libcpp_is_signed_integer<_Tp>::value;
 
+template <class _Tp>
+concept __libcpp_integer = __libcpp_unsigned_integer<_Tp> || __libcpp_signed_integer<_Tp>;
+
 #endif // _LIBCPP_STD_VER >= 20
 
 _LIBCPP_END_NAMESPACE_STD
diff --git a/libcxx/test/libcxx/concepts/concepts.arithmetic/arithmetic.compile.pass.cpp b/libcxx/test/libcxx/concepts/concepts.arithmetic/arithmetic.compile.pass.cpp
new file mode 100644
index 00000000000000..e234615f544133
--- /dev/null
+++ b/libcxx/test/libcxx/concepts/concepts.arithmetic/arithmetic.compile.pass.cpp
@@ -0,0 +1,118 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// UNSUPPORTED: c++03, c++11, c++14, c++17
+
+#include <concepts>
+#include <numbers>
+
+struct SomeObject {};
+
+// Concept helpers for the internal type traits for the fundamental types.
+
+// template <class _Tp>
+// concept __libcpp_unsigned_integer;
+
+// Unsigned
+static_assert(std::__libcpp_unsigned_integer<unsigned char>);
+static_assert(std::__libcpp_unsigned_integer<unsigned short int>);
+static_assert(std::__libcpp_unsigned_integer<unsigned int>);
+static_assert(std::__libcpp_unsigned_integer<unsigned long int>);
+static_assert(std::__libcpp_unsigned_integer<unsigned long long int>);
+static_assert(std::__libcpp_unsigned_integer<unsigned short int>);
+#ifndef _LIBCPP_HAS_NO_INT128
+static_assert(std::__libcpp_unsigned_integer<__uint128_t>);
+#endif
+// Signed
+static_assert(!std::__libcpp_unsigned_integer<signed char>);
+static_assert(!std::__libcpp_unsigned_integer<short int>);
+static_assert(!std::__libcpp_unsigned_integer<int>);
+static_assert(!std::__libcpp_unsigned_integer<long int>);
+static_assert(!std::__libcpp_unsigned_integer<long long int>);
+static_assert(!std::__libcpp_unsigned_integer<short int>);
+#ifndef _LIBCPP_HAS_NO_INT128
+static_assert(!std::__libcpp_unsigned_integer<__int128_t>);
+#endif
+// Non-integer
+static_assert(!std::__libcpp_unsigned_integer<bool>);
+static_assert(!std::__libcpp_unsigned_integer<char8_t>);
+static_assert(!std::__libcpp_unsigned_integer<char16_t>);
+static_assert(!std::__libcpp_unsigned_integer<char32_t>);
+static_assert(!std::__libcpp_unsigned_integer<float>);
+static_assert(!std::__libcpp_unsigned_integer<double>);
+static_assert(!std::__libcpp_unsigned_integer<long double>);
+static_assert(!std::__libcpp_unsigned_integer<void>);
+static_assert(!std::__libcpp_unsigned_integer<SomeObject>);
+
+// template <class _Tp>
+// concept __libcpp_signed_integer;
+
+// Unsigned
+static_assert(!std::__libcpp_signed_integer<unsigned char>);
+static_assert(!std::__libcpp_signed_integer<unsigned short int>);
+static_assert(!std::__libcpp_signed_integer<unsigned int>);
+static_assert(!std::__libcpp_signed_integer<unsigned long int>);
+static_assert(!std::__libcpp_signed_integer<unsigned long long int>);
+static_assert(!std::__libcpp_signed_integer<unsigned short int>);
+#ifndef _LIBCPP_HAS_NO_INT128
+static_assert(!std::__libcpp_signed_integer<__uint128_t>);
+#endif
+// Signed
+static_assert(std::__libcpp_signed_integer<signed char>);
+static_assert(std::__libcpp_signed_integer<short int>);
+static_assert(std::__libcpp_signed_integer<int>);
+static_assert(std::__libcpp_signed_integer<long int>);
+static_assert(std::__libcpp_signed_integer<long long int>);
+static_assert(std::__libcpp_signed_integer<short int>);
+#ifndef _LIBCPP_HAS_NO_INT128
+static_assert(std::__libcpp_signed_integer<__int128_t>);
+#endif
+// Non-integer
+static_assert(!std::__libcpp_signed_integer<bool>);
+static_assert(!std::__libcpp_signed_integer<char8_t>);
+static_assert(!std::__libcpp_signed_integer<char16_t>);
+static_assert(!std::__libcpp_signed_integer<char32_t>);
+static_assert(!std::__libcpp_signed_integer<float>);
+static_assert(!std::__libcpp_signed_integer<double>);
+static_assert(!std::__libcpp_signed_integer<long double>);
+static_assert(!std::__libcpp_signed_integer<void>);
+static_assert(!std::__libcpp_signed_integer<SomeObject>);
+
+// template <class _Tp>
+// concept __libcpp_integer;
+
+// Unsigned
+static_assert(std::__libcpp_integer<unsigned char>);
+static_assert(std::__libcpp_integer<unsigned short int>);
+static_assert(std::__libcpp_integer<unsigned int>);
+static_assert(std::__libcpp_integer<unsigned long int>);
+static_assert(std::__libcpp_integer<unsigned long long int>);
+static_assert(std::__libcpp_integer<unsigned short int>);
+#ifndef _LIBCPP_HAS_NO_INT128
+static_assert(std::__libcpp_integer<__uint128_t>);
+#endif
+// Signed
+static_assert(std::__libcpp_integer<signed char>);
+static_assert(std::__libcpp_integer<short int>);
+static_assert(std::__libcpp_integer<int>);
+static_assert(std::__libcpp_integer<long int>);
+static_assert(std::__libcpp_integer<long long int>);
+static_assert(std::__libcpp_integer<short int>);
+#ifndef _LIBCPP_HAS_NO_INT128
+static_assert(std::__libcpp_integer<__int128_t>);
+#endif
+// Non-integer
+static_assert(!std::__libcpp_integer<bool>);
+static_assert(!std::__libcpp_integer<char8_t>);
+static_assert(!std::__libcpp_integer<char16_t>);
+static_assert(!std::__libcpp_integer<char32_t>);
+static_assert(!std::__libcpp_integer<float>);
+static_assert(!std::__libcpp_integer<double>);
+static_assert(!std::__libcpp_integer<long double>);
+static_assert(!std::__libcpp_integer<void>);
+static_assert(!std::__libcpp_integer<SomeObject>);

H-G-Hristov · 2024-01-14T07:40:57Z

@mordante @frederick-vs-ja This adds std::__libcpp_integer concept as a prerequisite from this discussion: #77967 (comment)

Any ideas for an alternative name, e.g.
- std::__libcpp_true_integer
- std::__libcpp_integer_type
I have not replaced __is_safe_integral_cmp in this patch as suggested [libc++][numeric] P0543R3: Saturation arithmetic #77967 (comment). I can do it in a follow-up patch.

...and tests.

…r-concept

mordante

@mordante @frederick-vs-ja This adds std::__libcpp_integer concept as a prerequisite from this discussion: #77967 (comment)

* Any ideas for an alternative name, e.g.
  
  * `std::__libcpp_true_integer`
  * `std::__libcpp_integer_type`

* I have not replaced `__is_safe_integral_cmp` in this patch as suggested [[libc++][numeric] P0543R3: Saturation arithmetic #77967 (comment)](https://github.com/llvm/llvm-project/pull/77967#discussion_r1451099830). I can do it in a follow-up patch.

Thanks. I would keep the name as is. Why do you want to provide different names.

LGTM modulo some small nits.

libcxx/test/libcxx/concepts/concepts.arithmetic/arithmetic.compile.pass.cpp

H-G-Hristov · 2024-01-14T16:06:40Z

@mordante @frederick-vs-ja This adds std::__libcpp_integer concept as a prerequisite from this discussion: #77967 (comment)
* Any ideas for an alternative name, e.g.
  
  * `std::__libcpp_true_integer`
  * `std::__libcpp_integer_type`

* I have not replaced `__is_safe_integral_cmp` in this patch as suggested [[libc++][numeric] P0543R3: Saturation arithmetic #77967 (comment)](https://github.com/llvm/llvm-project/pull/77967#discussion_r1451099830). I can do it in a follow-up patch.
Thanks. I would keep the name as is. Why do you want to provide different names.

Thank you! Never mind the question then.

H-G-Hristov · 2024-01-14T17:42:12Z

86\test\std\utilities\format\format.functions\Output\formatted_size.pass.cpp.dir\t.tmp.exe'
# .---command stderr------------
# | Traceback (most recent call last):
# |   File "C:\ws\src\libcxx\utils\run.py", line 72, in <module>
# |     exit(main())
# |   File "C:\ws\src\libcxx\utils\run.py", line 68, in main
# |     return subprocess.call(commandLine, cwd=args.execdir, env=env, shell=False)
# |   File "c:\python39\lib\subprocess.py", line 349, in call
# |     with Popen(*popenargs, **kwargs) as p:
# |   File "c:\python39\lib\subprocess.py", line 951, in __init__
# |     self._execute_child(args, executable, preexec_fn, close_fds,
# |   File "c:\python39\lib\subprocess.py", line 1420, in _execute_child
# |     hp, ht, pid, tid = _winapi.CreateProcess(executable, args,
# | OSError: [WinError 225] Operation did not complete successfully because the file contains a virus or potentially unwanted

…r-concept

mordante · 2024-01-14T18:49:33Z

86\test\std\utilities\format\format.functions\Output\formatted_size.pass.cpp.dir\t.tmp.exe'
# .---command stderr------------
# | Traceback (most recent call last):
# |   File "C:\ws\src\libcxx\utils\run.py", line 72, in <module>
# |     exit(main())
# |   File "C:\ws\src\libcxx\utils\run.py", line 68, in main
# |     return subprocess.call(commandLine, cwd=args.execdir, env=env, shell=False)
# |   File "c:\python39\lib\subprocess.py", line 349, in call
# |     with Popen(*popenargs, **kwargs) as p:
# |   File "c:\python39\lib\subprocess.py", line 951, in __init__
# |     self._execute_child(args, executable, preexec_fn, close_fds,
# |   File "c:\python39\lib\subprocess.py", line 1420, in _execute_child
# |     hp, ht, pid, tid = _winapi.CreateProcess(executable, args,
# | OSError: [WinError 225] Operation did not complete successfully because the file contains a virus or potentially unwanted

I've seen that happen before :-/

mordante

LGTM! Thanks! Please ping me when you've update your other patch with these changes.

H-G-Hristov · 2024-01-14T19:05:14Z

LGTM! Thanks! Please ping me when you've update your other patch with these changes.

Thank you! I'll ping you when I am ready with the other patch. I still need to implement additional tests.

Implements: https://wg21.link/P0543R3 - https://eel.is/c++draft/numeric.sat Additional references: - Division: https://eel.is/c++draft/expr.mul#4 - Arithmetic conversions: https://eel.is/c++draft/expr.arith.conv#1 - Clang builtins: https://clang.llvm.org/docs/LanguageExtensions.html#builtin-functions Depends on: #78086 --------- Co-authored-by: Zingam <zingam@outlook.com> Co-authored-by: Mark de Wever <zar-rpg@xs4all.nl>

…#78086) ...and tests. --------- Co-authored-by: Zingam <zingam@outlook.com>

Implements: https://wg21.link/P0543R3 - https://eel.is/c++draft/numeric.sat Additional references: - Division: https://eel.is/c++draft/expr.mul#4 - Arithmetic conversions: https://eel.is/c++draft/expr.arith.conv#1 - Clang builtins: https://clang.llvm.org/docs/LanguageExtensions.html#builtin-functions Depends on: llvm/llvm-project#78086 --------- Co-authored-by: Zingam <zingam@outlook.com> Co-authored-by: Mark de Wever <zar-rpg@xs4all.nl> NOKEYCHECK=True GitOrigin-RevId: 03c19e91e8d8cb706b58e02d69f80caeaf7eb0f4

H-G-Hristov requested a review from a team as a code owner January 14, 2024 07:35

llvmbot added the libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi. label Jan 14, 2024

H-G-Hristov mentioned this pull request Jan 14, 2024

[libc++][numeric] P0543R3: Saturation arithmetic #77967

Merged

[libc++][concepts] Implements concept helper __libcpp_integer

f2008de

...and tests.

H-G-Hristov force-pushed the hgh/libcxx/concepts-added-__libcxx_is_integer-concept branch from 4ab449d to f2008de Compare January 14, 2024 08:06

Merge branch 'main' into hgh/libcxx/concepts-added-__libcxx_is_intege…

aef62b7

…r-concept

Zingam requested a review from mordante January 14, 2024 12:08

mordante reviewed Jan 14, 2024

View reviewed changes

libcxx/test/libcxx/concepts/concepts.arithmetic/arithmetic.compile.pass.cpp Outdated Show resolved Hide resolved

libcxx/test/libcxx/concepts/concepts.arithmetic/arithmetic.compile.pass.cpp Outdated Show resolved Hide resolved

Zingam added 4 commits January 14, 2024 17:43

Addressed comments

62385a3

Split test

91eafc8

Name tweak

576458b

Tweaks and fixes

c14139b

Merge branch 'main' into hgh/libcxx/concepts-added-__libcxx_is_intege…

c3af022

…r-concept

H-G-Hristov requested a review from mordante January 14, 2024 18:49

mordante approved these changes Jan 14, 2024

View reviewed changes

Zingam merged commit bddd8f4 into llvm:main Jan 14, 2024
45 checks passed

H-G-Hristov deleted the hgh/libcxx/concepts-added-__libcxx_is_integer-concept branch January 14, 2024 22:06

justinfargnoli pushed a commit to justinfargnoli/llvm-project that referenced this pull request Jan 28, 2024

[libc++][concepts] Implements concept helper __libcpp_integer (llvm…

6c0505c

…#78086) ...and tests. --------- Co-authored-by: Zingam <zingam@outlook.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[libc++][concepts] Implements concept helper `__libcpp_integer` #78086

[libc++][concepts] Implements concept helper `__libcpp_integer` #78086

H-G-Hristov commented Jan 14, 2024

llvmbot commented Jan 14, 2024

H-G-Hristov commented Jan 14, 2024 •

edited by Zingam

mordante left a comment

H-G-Hristov commented Jan 14, 2024

H-G-Hristov commented Jan 14, 2024

mordante commented Jan 14, 2024

mordante left a comment

H-G-Hristov commented Jan 14, 2024

[libc++][concepts] Implements concept helper __libcpp_integer #78086

[libc++][concepts] Implements concept helper __libcpp_integer #78086

Conversation

H-G-Hristov commented Jan 14, 2024

llvmbot commented Jan 14, 2024

H-G-Hristov commented Jan 14, 2024 • edited by Zingam

mordante left a comment

Choose a reason for hiding this comment

H-G-Hristov commented Jan 14, 2024

H-G-Hristov commented Jan 14, 2024

mordante commented Jan 14, 2024

mordante left a comment

Choose a reason for hiding this comment

H-G-Hristov commented Jan 14, 2024

[libc++][concepts] Implements concept helper `__libcpp_integer` #78086

[libc++][concepts] Implements concept helper `__libcpp_integer` #78086

H-G-Hristov commented Jan 14, 2024 •

edited by Zingam