[libc-commits] [libc] [libc] implement iswcntrl support (PR #185273)
via libc-commits
libc-commits at lists.llvm.org
Sun Mar 8 05:46:05 PDT 2026
https://github.com/valium007 updated https://github.com/llvm/llvm-project/pull/185273
>From ed6a3562a71ff31a1a7fe1d1ac3ee5322145cfcf Mon Sep 17 00:00:00 2001
From: valium007 <valium007 at proton.me>
Date: Sun, 8 Mar 2026 17:40:07 +0530
Subject: [PATCH 1/4] [libc] implement iswcntrl support
---
libc/config/baremetal/arm/entrypoints.txt | 1 +
libc/config/baremetal/riscv/entrypoints.txt | 1 +
libc/config/darwin/aarch64/entrypoints.txt | 1 +
libc/config/linux/aarch64/entrypoints.txt | 1 +
libc/config/linux/arm/entrypoints.txt | 1 +
libc/config/linux/riscv/entrypoints.txt | 1 +
libc/config/linux/x86_64/entrypoints.txt | 1 +
libc/config/windows/entrypoints.txt | 1 +
libc/include/wctype.yaml | 6 ++++
libc/src/wctype/CMakeLists.txt | 10 +++++++
libc/src/wctype/iswcntrl.cpp | 21 ++++++++++++++
libc/src/wctype/iswcntrl.h | 21 ++++++++++++++
libc/test/src/wctype/CMakeLists.txt | 10 +++++++
libc/test/src/wctype/iswcntrl_test.cpp | 31 +++++++++++++++++++++
14 files changed, 107 insertions(+)
create mode 100644 libc/src/wctype/iswcntrl.cpp
create mode 100644 libc/src/wctype/iswcntrl.h
create mode 100644 libc/test/src/wctype/iswcntrl_test.cpp
diff --git a/libc/config/baremetal/arm/entrypoints.txt b/libc/config/baremetal/arm/entrypoints.txt
index 7bc92e84b7fa4..c9b69a5b594d4 100644
--- a/libc/config/baremetal/arm/entrypoints.txt
+++ b/libc/config/baremetal/arm/entrypoints.txt
@@ -299,6 +299,7 @@ set(TARGET_LIBC_ENTRYPOINTS
# wctype.h entrypoints
libc.src.wctype.iswalpha
+ libc.src.wctype.iswcntrl
# internal entrypoints
libc.startup.baremetal.init
diff --git a/libc/config/baremetal/riscv/entrypoints.txt b/libc/config/baremetal/riscv/entrypoints.txt
index 29be47dfbfd53..9e5f2e2f725ba 100644
--- a/libc/config/baremetal/riscv/entrypoints.txt
+++ b/libc/config/baremetal/riscv/entrypoints.txt
@@ -296,6 +296,7 @@ set(TARGET_LIBC_ENTRYPOINTS
# wctype.h entrypoints
libc.src.wctype.iswalpha
+ libc.src.wctype.iswcntrl
# internal entrypoints
libc.startup.baremetal.init
diff --git a/libc/config/darwin/aarch64/entrypoints.txt b/libc/config/darwin/aarch64/entrypoints.txt
index b4a1ee70764cb..b0399398fae9f 100644
--- a/libc/config/darwin/aarch64/entrypoints.txt
+++ b/libc/config/darwin/aarch64/entrypoints.txt
@@ -102,6 +102,7 @@ set(TARGET_LIBC_ENTRYPOINTS
# wctype.h entrypoints
libc.src.wctype.iswalpha
+ libc.src.wctype.iswcntrl
)
if(LLVM_LIBC_FULL_BUILD)
diff --git a/libc/config/linux/aarch64/entrypoints.txt b/libc/config/linux/aarch64/entrypoints.txt
index 960958b7cf90a..53276c58fd91b 100644
--- a/libc/config/linux/aarch64/entrypoints.txt
+++ b/libc/config/linux/aarch64/entrypoints.txt
@@ -369,6 +369,7 @@ set(TARGET_LIBC_ENTRYPOINTS
# wctype.h entrypoints
libc.src.wctype.iswalpha
+ libc.src.wctype.iswcntrl
# sys/uio.h entrypoints
libc.src.sys.uio.writev
diff --git a/libc/config/linux/arm/entrypoints.txt b/libc/config/linux/arm/entrypoints.txt
index e76bf81670ce5..5a328f2a2f9db 100644
--- a/libc/config/linux/arm/entrypoints.txt
+++ b/libc/config/linux/arm/entrypoints.txt
@@ -194,6 +194,7 @@ set(TARGET_LIBC_ENTRYPOINTS
# wctype.h entrypoints
libc.src.wctype.iswalpha
+ libc.src.wctype.iswcntrl
)
if(LLVM_LIBC_FULL_BUILD)
diff --git a/libc/config/linux/riscv/entrypoints.txt b/libc/config/linux/riscv/entrypoints.txt
index a69d1a1b0a642..9fbee113906ce 100644
--- a/libc/config/linux/riscv/entrypoints.txt
+++ b/libc/config/linux/riscv/entrypoints.txt
@@ -373,6 +373,7 @@ set(TARGET_LIBC_ENTRYPOINTS
# wctype.h entrypoints
libc.src.wctype.iswalpha
+ libc.src.wctype.iswcntrl
# sys/uio.h entrypoints
libc.src.sys.uio.writev
diff --git a/libc/config/linux/x86_64/entrypoints.txt b/libc/config/linux/x86_64/entrypoints.txt
index 4103ee0331a23..a8585fe8ba42e 100644
--- a/libc/config/linux/x86_64/entrypoints.txt
+++ b/libc/config/linux/x86_64/entrypoints.txt
@@ -418,6 +418,7 @@ set(TARGET_LIBC_ENTRYPOINTS
# wctype.h entrypoints
libc.src.wctype.iswalpha
+ libc.src.wctype.iswcntrl
# sys/uio.h entrypoints
libc.src.sys.uio.writev
diff --git a/libc/config/windows/entrypoints.txt b/libc/config/windows/entrypoints.txt
index f777fc6c94bc2..10608b7f64ccc 100644
--- a/libc/config/windows/entrypoints.txt
+++ b/libc/config/windows/entrypoints.txt
@@ -108,6 +108,7 @@ set(TARGET_LIBC_ENTRYPOINTS
# wctype.h entrypoints
libc.src.wctype.iswalpha
+ libc.src.wctype.iswcntrl
)
set(TARGET_LIBM_ENTRYPOINTS
diff --git a/libc/include/wctype.yaml b/libc/include/wctype.yaml
index fb4f96f7d17e4..57c164d00fcba 100644
--- a/libc/include/wctype.yaml
+++ b/libc/include/wctype.yaml
@@ -8,3 +8,9 @@ functions:
return_type: int
arguments:
- type: wint_t
+ - name: iswcntrl
+ standards:
+ - stdc
+ return_type: int
+ arguments:
+ - type: wint_t
\ No newline at end of file
diff --git a/libc/src/wctype/CMakeLists.txt b/libc/src/wctype/CMakeLists.txt
index 3ac5eaef8ed8b..00c3b92c9e579 100644
--- a/libc/src/wctype/CMakeLists.txt
+++ b/libc/src/wctype/CMakeLists.txt
@@ -7,3 +7,13 @@ add_entrypoint_object(
DEPENDS
libc.src.__support.wctype_utils
)
+
+add_entrypoint_object(
+ iswcntrl
+ SRCS
+ iswcntrl.cpp
+ HDRS
+ iswcntrl.h
+ DEPENDS
+ libc.src.__support.wctype_utils
+)
\ No newline at end of file
diff --git a/libc/src/wctype/iswcntrl.cpp b/libc/src/wctype/iswcntrl.cpp
new file mode 100644
index 0000000000000..3562c3c5bf882
--- /dev/null
+++ b/libc/src/wctype/iswcntrl.cpp
@@ -0,0 +1,21 @@
+//===-- Implementation of iswcntrl ----------------------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#include "src/wctype/iswcntrl.h"
+#include "src/__support/common.h"
+#include "src/__support/wctype_utils.h"
+
+#include "hdr/types/wint_t.h"
+
+namespace LIBC_NAMESPACE_DECL {
+
+LLVM_LIBC_FUNCTION(int, iswcntrl, (wint_t c)) {
+ return internal::isupper(static_cast<wchar_t>(c));
+}
+
+} // namespace LIBC_NAMESPACE_DECL
\ No newline at end of file
diff --git a/libc/src/wctype/iswcntrl.h b/libc/src/wctype/iswcntrl.h
new file mode 100644
index 0000000000000..f4eaee60ed444
--- /dev/null
+++ b/libc/src/wctype/iswcntrl.h
@@ -0,0 +1,21 @@
+//===-- Implementation header for iswcntrl ----------------------*- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SRC_WCTYPE_ISWCNTRL_H
+#define LLVM_LIBC_SRC_WCTYPE_ISWCNTRL_H
+
+#include "hdr/types/wint_t.h"
+#include "src/__support/common.h"
+
+namespace LIBC_NAMESPACE_DECL {
+
+int iswcntrl(wint_t c);
+
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_SRC_WCTYPE_ISWCNTRL_H
\ No newline at end of file
diff --git a/libc/test/src/wctype/CMakeLists.txt b/libc/test/src/wctype/CMakeLists.txt
index 5459cdb4a9b71..7680a758743d6 100644
--- a/libc/test/src/wctype/CMakeLists.txt
+++ b/libc/test/src/wctype/CMakeLists.txt
@@ -9,3 +9,13 @@ add_libc_test(
DEPENDS
libc.src.wctype.iswalpha
)
+
+add_libc_test(
+ iswcntrl_test
+ SUITE
+ libc_wctype_unittests
+ SRCS
+ iswcntrl_test.cpp
+ DEPENDS
+ libc.src.wctype.iswcntrl
+)
\ No newline at end of file
diff --git a/libc/test/src/wctype/iswcntrl_test.cpp b/libc/test/src/wctype/iswcntrl_test.cpp
new file mode 100644
index 0000000000000..af15759aa0466
--- /dev/null
+++ b/libc/test/src/wctype/iswcntrl_test.cpp
@@ -0,0 +1,31 @@
+//===-- Unittests for iswcntrl --------------------------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#include "src/wctype/iswcntrl.h"
+
+#include "test/UnitTest/Test.h"
+
+TEST(LlvmLibciswcntrl, DefaultLocale) {
+ EXPECT_NE(LIBC_NAMESPACE::iswcntrl(L'\0'), 0);
+ EXPECT_NE(LIBC_NAMESPACE::iswcntrl(L'\t'), 0);
+ EXPECT_NE(LIBC_NAMESPACE::iswcntrl(L'\n'), 0);
+ EXPECT_NE(LIBC_NAMESPACE::iswcntrl(L'\v'), 0);
+ EXPECT_NE(LIBC_NAMESPACE::iswcntrl(L'\f'), 0);
+ EXPECT_NE(LIBC_NAMESPACE::iswcntrl(L'\r'), 0);
+
+ EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L' '), 0);
+ EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L'!'), 0);
+ EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L'0'), 0);
+ EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L'9'), 0);
+ EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L'A'), 0);
+ EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L'Z'), 0);
+ EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L'a'), 0);
+ EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L'z'), 0);
+ EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L'?'), 0);
+ EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L'~'), 0);
+}
\ No newline at end of file
>From eaf51b12516654246bc7b986f4d5f7109fb19789 Mon Sep 17 00:00:00 2001
From: valium007 <valium007 at proton.me>
Date: Sun, 8 Mar 2026 18:05:28 +0530
Subject: [PATCH 2/4] fix clang-format error
---
libc/include/wctype.yaml | 2 +-
libc/src/wctype/CMakeLists.txt | 2 +-
libc/src/wctype/iswcntrl.cpp | 2 +-
libc/src/wctype/iswcntrl.h | 2 +-
libc/test/src/wctype/CMakeLists.txt | 2 +-
libc/test/src/wctype/iswcntrl_test.cpp | 32 +++++++++++++-------------
6 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/libc/include/wctype.yaml b/libc/include/wctype.yaml
index 57c164d00fcba..f522db5f89316 100644
--- a/libc/include/wctype.yaml
+++ b/libc/include/wctype.yaml
@@ -13,4 +13,4 @@ functions:
- stdc
return_type: int
arguments:
- - type: wint_t
\ No newline at end of file
+ - type: wint_t
diff --git a/libc/src/wctype/CMakeLists.txt b/libc/src/wctype/CMakeLists.txt
index 00c3b92c9e579..6df2bbfea678a 100644
--- a/libc/src/wctype/CMakeLists.txt
+++ b/libc/src/wctype/CMakeLists.txt
@@ -16,4 +16,4 @@ add_entrypoint_object(
iswcntrl.h
DEPENDS
libc.src.__support.wctype_utils
-)
\ No newline at end of file
+)
diff --git a/libc/src/wctype/iswcntrl.cpp b/libc/src/wctype/iswcntrl.cpp
index 3562c3c5bf882..f908697ece1a4 100644
--- a/libc/src/wctype/iswcntrl.cpp
+++ b/libc/src/wctype/iswcntrl.cpp
@@ -15,7 +15,7 @@
namespace LIBC_NAMESPACE_DECL {
LLVM_LIBC_FUNCTION(int, iswcntrl, (wint_t c)) {
- return internal::isupper(static_cast<wchar_t>(c));
+ return internal::iswcntrl(static_cast<wchar_t>(c));
}
} // namespace LIBC_NAMESPACE_DECL
\ No newline at end of file
diff --git a/libc/src/wctype/iswcntrl.h b/libc/src/wctype/iswcntrl.h
index f4eaee60ed444..fd9c6732005da 100644
--- a/libc/src/wctype/iswcntrl.h
+++ b/libc/src/wctype/iswcntrl.h
@@ -18,4 +18,4 @@ int iswcntrl(wint_t c);
} // namespace LIBC_NAMESPACE_DECL
-#endif // LLVM_LIBC_SRC_WCTYPE_ISWCNTRL_H
\ No newline at end of file
+#endif // LLVM_LIBC_SRC_WCTYPE_ISWCNTRL_H
diff --git a/libc/test/src/wctype/CMakeLists.txt b/libc/test/src/wctype/CMakeLists.txt
index 7680a758743d6..3f90e8be6bfce 100644
--- a/libc/test/src/wctype/CMakeLists.txt
+++ b/libc/test/src/wctype/CMakeLists.txt
@@ -18,4 +18,4 @@ add_libc_test(
iswcntrl_test.cpp
DEPENDS
libc.src.wctype.iswcntrl
-)
\ No newline at end of file
+)
diff --git a/libc/test/src/wctype/iswcntrl_test.cpp b/libc/test/src/wctype/iswcntrl_test.cpp
index af15759aa0466..556fb791d8f1c 100644
--- a/libc/test/src/wctype/iswcntrl_test.cpp
+++ b/libc/test/src/wctype/iswcntrl_test.cpp
@@ -11,21 +11,21 @@
#include "test/UnitTest/Test.h"
TEST(LlvmLibciswcntrl, DefaultLocale) {
- EXPECT_NE(LIBC_NAMESPACE::iswcntrl(L'\0'), 0);
- EXPECT_NE(LIBC_NAMESPACE::iswcntrl(L'\t'), 0);
- EXPECT_NE(LIBC_NAMESPACE::iswcntrl(L'\n'), 0);
- EXPECT_NE(LIBC_NAMESPACE::iswcntrl(L'\v'), 0);
- EXPECT_NE(LIBC_NAMESPACE::iswcntrl(L'\f'), 0);
- EXPECT_NE(LIBC_NAMESPACE::iswcntrl(L'\r'), 0);
+ EXPECT_NE(LIBC_NAMESPACE::iswcntrl(L'\0'), 0);
+ EXPECT_NE(LIBC_NAMESPACE::iswcntrl(L'\t'), 0);
+ EXPECT_NE(LIBC_NAMESPACE::iswcntrl(L'\n'), 0);
+ EXPECT_NE(LIBC_NAMESPACE::iswcntrl(L'\v'), 0);
+ EXPECT_NE(LIBC_NAMESPACE::iswcntrl(L'\f'), 0);
+ EXPECT_NE(LIBC_NAMESPACE::iswcntrl(L'\r'), 0);
- EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L' '), 0);
- EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L'!'), 0);
- EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L'0'), 0);
- EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L'9'), 0);
- EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L'A'), 0);
- EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L'Z'), 0);
- EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L'a'), 0);
- EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L'z'), 0);
- EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L'?'), 0);
- EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L'~'), 0);
+ EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L' '), 0);
+ EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L'!'), 0);
+ EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L'0'), 0);
+ EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L'9'), 0);
+ EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L'A'), 0);
+ EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L'Z'), 0);
+ EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L'a'), 0);
+ EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L'z'), 0);
+ EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L'?'), 0);
+ EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L'~'), 0);
}
\ No newline at end of file
>From 36123bd493c97846d233508fbe2141009335dfed Mon Sep 17 00:00:00 2001
From: valium007 <valium007 at proton.me>
Date: Sun, 8 Mar 2026 18:09:27 +0530
Subject: [PATCH 3/4] fix newline error
---
libc/src/wctype/iswcntrl.cpp | 2 +-
libc/test/src/wctype/iswcntrl_test.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libc/src/wctype/iswcntrl.cpp b/libc/src/wctype/iswcntrl.cpp
index f908697ece1a4..480bc44c5886e 100644
--- a/libc/src/wctype/iswcntrl.cpp
+++ b/libc/src/wctype/iswcntrl.cpp
@@ -18,4 +18,4 @@ LLVM_LIBC_FUNCTION(int, iswcntrl, (wint_t c)) {
return internal::iswcntrl(static_cast<wchar_t>(c));
}
-} // namespace LIBC_NAMESPACE_DECL
\ No newline at end of file
+} // namespace LIBC_NAMESPACE_DECL
diff --git a/libc/test/src/wctype/iswcntrl_test.cpp b/libc/test/src/wctype/iswcntrl_test.cpp
index 556fb791d8f1c..2b12c19c0f60b 100644
--- a/libc/test/src/wctype/iswcntrl_test.cpp
+++ b/libc/test/src/wctype/iswcntrl_test.cpp
@@ -28,4 +28,4 @@ TEST(LlvmLibciswcntrl, DefaultLocale) {
EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L'z'), 0);
EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L'?'), 0);
EXPECT_EQ(LIBC_NAMESPACE::iswcntrl(L'~'), 0);
-}
\ No newline at end of file
+}
>From 2144fafc392ec7d9a2b07829f87a256843c531e9 Mon Sep 17 00:00:00 2001
From: valium007 <49368101+valium007 at users.noreply.github.com>
Date: Sun, 8 Mar 2026 18:15:56 +0530
Subject: [PATCH 4/4] Change iswcntrl to call iscntrl function
---
libc/src/wctype/iswcntrl.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libc/src/wctype/iswcntrl.cpp b/libc/src/wctype/iswcntrl.cpp
index 480bc44c5886e..dbf0b0f841cc2 100644
--- a/libc/src/wctype/iswcntrl.cpp
+++ b/libc/src/wctype/iswcntrl.cpp
@@ -15,7 +15,7 @@
namespace LIBC_NAMESPACE_DECL {
LLVM_LIBC_FUNCTION(int, iswcntrl, (wint_t c)) {
- return internal::iswcntrl(static_cast<wchar_t>(c));
+ return internal::iscntrl(static_cast<wchar_t>(c));
}
} // namespace LIBC_NAMESPACE_DECL
More information about the libc-commits
mailing list