Commit c805a0bc63 for perl
commit c805a0bc63600dafdba078b2bac75f5e87f0652c
Author: Karl Williamson <khw@cpan.org>
Date: Tue Sep 8 08:30:49 2026 -0600
Remove deprecated function utf8_to_uvchr
diff --git a/embed.fnc b/embed.fnc
index 0fe795fe44..767ee9ef8c 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -4185,8 +4185,6 @@ ATdmp |bool |utf8_to_uv |SPTR const U8 * const s \
|EPTRge const U8 * const e \
|NN UV *cp_p \
|NULLOK Size_t *advance_p
-ADbdp |UV |utf8_to_uvchr |NN const U8 *s \
- |NULLOK STRLEN *retlen
ABMdip |UV |utf8_to_uvchr_buf \
|SPTR const U8 *s \
|EPTRge const U8 *send \
diff --git a/embed.h b/embed.h
index b85a42b705..99d39573dc 100644
--- a/embed.h
+++ b/embed.h
@@ -975,7 +975,6 @@
# endif
# endif
# if !defined(NO_MATHOMS)
-# define utf8_to_uvchr(a,b) Perl_utf8_to_uvchr(aTHX_ a,b)
# define utf8_to_uvuni(a,b) Perl_utf8_to_uvuni(aTHX_ a,b)
# define utf8n_to_uvuni(a,b,c,d) Perl_utf8n_to_uvuni(aTHX_ a,b,c,d)
# define uvuni_to_utf8(a,b) Perl_uvuni_to_utf8(aTHX_ a,b)
diff --git a/mathoms.c b/mathoms.c
index f807b73b00..45c20b0919 100644
--- a/mathoms.c
+++ b/mathoms.c
@@ -181,24 +181,6 @@ Perl_utf8n_to_uvuni(pTHX_ const U8 *s, STRLEN curlen, STRLEN *retlen, U32 flags)
return NATIVE_TO_UNI(utf8n_to_uvchr(s, curlen, retlen, flags));
}
-UV
-Perl_utf8_to_uvchr(pTHX_ const U8 *s, STRLEN *retlen)
-{
- PERL_ARGS_ASSERT_UTF8_TO_UVCHR; /* Deprecated since 5.38 */
-
- /* This function is unsafe if malformed UTF-8 input is given it, which is
- * why the function is deprecated. If the first byte of the input
- * indicates that there are more bytes remaining in the sequence that forms
- * the character than there are in the input buffer, it can read past the
- * end. But we can make it safe if the input string happens to be
- * NUL-terminated, as many strings in Perl are, by refusing to read past a
- * NUL, which is what UTF8_CHK_SKIP() does. A NUL indicates the start of
- * the next character anyway. If the input isn't NUL-terminated, the
- * function remains unsafe, as it always has been. */
-
- return utf8_to_uvchr_buf(s, s + UTF8_CHK_SKIP(s), retlen);
-}
-
GCC_DIAG_RESTORE
#endif /* NO_MATHOMS */
diff --git a/proto.h b/proto.h
index 8b0598b7b4..c3aa1cb79b 100644
--- a/proto.h
+++ b/proto.h
@@ -11122,16 +11122,6 @@ PERL_CALLCONV void
Perl_load_mathoms(void);
# define PERL_ARGS_ASSERT_LOAD_MATHOMS
-PERL_CALLCONV UV
-Perl_utf8_to_uvchr(pTHX_ const U8 *s, STRLEN *retlen)
- Perl_attribute_nonnull_aTHX
- Perl_attribute_nonnull(pTHX_1)
- __attribute__deprecated__;
-# define PERL_ARGS_ASSERT_UTF8_TO_UVCHR \
- STMT_START { Perl_assert_aTHX; assert(s); \
- PERL_UNUSED_CONTEXT_FOR_ARGS_ASSERT; \
- } STMT_END
-
PERL_CALLCONV UV
Perl_utf8_to_uvuni(pTHX_ const U8 *s, STRLEN *retlen)
Perl_attribute_nonnull_aTHX