Skip to content

Commit a810de6

Browse files
committed
Rm Perl_sv_utf8_upgrade() from mathoms
This function can be converted to call plain sv_utf8_upgrade without changing its behavior. I verified this by eyeballing its implementation in mathoms.c and comparing that with what happens with just the plain macro. That means embed.fnc can be changed to generate the Perl_ form automatically, and the mathoms function can be removed.
1 parent 5144e0d commit a810de6

File tree

4 files changed

+6
-18
lines changed

4 files changed

+6
-18
lines changed

embed.fnc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3532,7 +3532,7 @@ Adm |bool |sv_utf8_downgrade_nomg \
35323532
|NN SV * const sv \
35333533
|const bool fail_ok
35343534
Adp |void |sv_utf8_encode |NN SV * const sv
3535-
AMbdp |STRLEN |sv_utf8_upgrade|NN SV *sv
3535+
Admp |STRLEN |sv_utf8_upgrade|NN SV *sv
35363536
Adm |STRLEN |sv_utf8_upgrade_flags \
35373537
|NN SV * const sv \
35383538
|const I32 flags

embed.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2325,6 +2325,7 @@
23252325
# define Perl_sv_usepvn(mTHX,a,b,c) sv_usepvn(a,b,c)
23262326
# define Perl_sv_usepvn_mg(mTHX,a,b,c) sv_usepvn_mg(a,b,c)
23272327
# define Perl_sv_utf8_downgrade(mTHX,a,b) sv_utf8_downgrade(a,b)
2328+
# define Perl_sv_utf8_upgrade(mTHX,a) sv_utf8_upgrade(a)
23282329
# define Perl_uv_to_utf8_msgs(mTHX,a,b,c,d) uv_to_utf8_msgs(a,b,c,d)
23292330
# define thread_locale_init() Perl_thread_locale_init(aTHX)
23302331
# define thread_locale_term() Perl_thread_locale_term(aTHX)
@@ -2384,6 +2385,7 @@
23842385
# define Perl_sv_usepvn sv_usepvn
23852386
# define Perl_sv_usepvn_mg sv_usepvn_mg
23862387
# define Perl_sv_utf8_downgrade sv_utf8_downgrade
2388+
# define Perl_sv_utf8_upgrade sv_utf8_upgrade
23872389
# define Perl_uv_to_utf8_msgs uv_to_utf8_msgs
23882390
# if defined(PERL_DONT_CREATE_GVSV)
23892391
# define Perl_gv_SVadd gv_SVadd

mathoms.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -128,18 +128,6 @@ Perl_sv_pvutf8(pTHX_ SV *sv)
128128
return sv_pv(sv);
129129
}
130130

131-
/* sv_utf8_upgrade() is now a macro using sv_utf8_upgrade_flags();
132-
* this function provided for binary compatibility only
133-
*/
134-
135-
STRLEN
136-
Perl_sv_utf8_upgrade(pTHX_ SV *sv)
137-
{
138-
PERL_ARGS_ASSERT_SV_UTF8_UPGRADE;
139-
140-
return sv_utf8_upgrade(sv);
141-
}
142-
143131
#if defined(HUGE_VAL) || (defined(USE_LONG_DOUBLE) && defined(HUGE_VALL))
144132
/*
145133
* This hack is to force load of "huge" support from libm.a

proto.h

Lines changed: 3 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)