Use new embed.fnc implementation for uv_to_utf8_flags

khwilliamson · khwilliamson · commit dee72af10f63 · 2025-07-11T05:43:05.000-06:00
This shows how the new capability works for chaining elements, as
uv_to_utf8 calls this, which now calls uv_to_utf8_msgs
diff --git a/embed.fnc b/embed.fnc
@@ -3860,10 +3860,11 @@ Cp	|U8 *	|uvoffuni_to_utf8_flags_msgs				\
 Adp	|U8 *	|uv_to_utf8	|NN U8 *d				\
 				|UV uv					\
 	      = uv_to_utf8_flags(d,uv,0)
-Adip	|U8 *	|uv_to_utf8_flags					\
+Adp	|U8 *	|uv_to_utf8_flags					\
 				|NN U8 *d				\
 				|UV uv					\
-				|UV flags
+				|UV flags				\
+	      = uv_to_utf8_msgs(d,uv,flags,0)
 Adip	|U8 *	|uv_to_utf8_msgs|NN U8 *d				\
 				|UV uv					\
 				|UV flags				\
diff --git a/embed.h b/embed.h
@@ -827,7 +827,7 @@
 # define utf8n_to_uvchr_error                   Perl_utf8n_to_uvchr_error
 # define utf8n_to_uvchr_msgs                    Perl_utf8n_to_uvchr_msgs
 # define uv_to_utf8(d,uv)                       uv_to_utf8_flags(d,uv,0)
-# define uv_to_utf8_flags(a,b,c)                Perl_uv_to_utf8_flags(aTHX_ a,b,c)
+# define uv_to_utf8_flags(d,uv,flags)           uv_to_utf8_msgs(d,uv,flags,0)
 # define uv_to_utf8_msgs(a,b,c,d)               Perl_uv_to_utf8_msgs(aTHX_ a,b,c,d)
 # define uvoffuni_to_utf8_flags_msgs(a,b,c,d)   Perl_uvoffuni_to_utf8_flags_msgs(aTHX_ a,b,c,d)
 # define valid_identifier_pve(a,b,c)            Perl_valid_identifier_pve(aTHX_ a,b,c)
@@ -2264,11 +2264,13 @@
 # if defined(USE_THREADS)
 #   define Perl_sv_setsv(mTHX,dsv,ssv)          Perl_sv_setsv_flags(mTHX,dsv,ssv,SV_GMAGIC|SV_DO_COW_SVSETSV)
 #   define Perl_uv_to_utf8(mTHX,d,uv)           Perl_uv_to_utf8_flags(mTHX,d,uv,0)
+#   define Perl_uv_to_utf8_flags(mTHX,d,uv,flags) Perl_uv_to_utf8_msgs(mTHX,d,uv,flags,0)
 #   define thread_locale_init()                 Perl_thread_locale_init(aTHX)
 #   define thread_locale_term()                 Perl_thread_locale_term(aTHX)
 # else
 #   define Perl_sv_setsv                        sv_setsv
 #   define Perl_uv_to_utf8                      uv_to_utf8
+#   define Perl_uv_to_utf8_flags                uv_to_utf8_flags
 # endif
 # if defined(VMS) || defined(WIN32)
 #   define do_aspawn(a,b,c)                     Perl_do_aspawn(aTHX_ a,b,c)
diff --git a/inline.h b/inline.h
@@ -3272,11 +3272,6 @@ Perl_utf8_to_uvchr_buf(pTHX_ const U8 *s, const U8 *send, STRLEN *retlen)
     return 0;
 }
 
-PERL_STATIC_INLINE U8 *
-Perl_uv_to_utf8_flags(pTHX_ U8 *d, UV uv, UV flags)
-{
-    return uv_to_utf8_msgs(d, uv, flags, 0);
-}
 PERL_STATIC_INLINE U8 *
 Perl_uv_to_utf8_msgs(pTHX_ U8 *d, UV uv, UV flags , HV **msgs)
 {
diff --git a/proto.h b/proto.h

Original file line number	Diff line number	Diff line change
`@@ -3272,11 +3272,6 @@ Perl_utf8_to_uvchr_buf(pTHX_ const U8 s, const U8 send, STRLEN *retlen)`
`3272`	`3272`	`return 0;`
`3273`	`3273`	`}`
`3274`	`3274`
`3275`		`-PERL_STATIC_INLINE U8 *`
`3276`		`-Perl_uv_to_utf8_flags(pTHX_ U8 *d, UV uv, UV flags)`
`3277`		`-{`
`3278`		`- return uv_to_utf8_msgs(d, uv, flags, 0);`
`3279`		`-}`
`3280`	`3275`	`PERL_STATIC_INLINE U8 *`
`3281`	`3276`	`Perl_uv_to_utf8_msgs(pTHX_ U8 d, UV uv, UV flags , HV *msgs)`
`3282`	`3277`	`{`