Skip to content

Commit c1ae415

Browse files
committed
Make Perl_sv_setsv a macro and rm from mathoms
93f23f0 made the Perl_ name generation automatic given the flags in embed.fnc. This function behaves differently when called from core than not, but making it into a macro that gets expanded as needed means it automatically gets expanded correctly.
1 parent ca4ce29 commit c1ae415

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
@@ -3454,7 +3454,7 @@ Adp |void |sv_setrv_noinc |NN SV * const sv \
34543454
Adp |void |sv_setrv_noinc_mg \
34553455
|NN SV * const sv \
34563456
|NN SV * const ref
3457-
AMbdp |void |sv_setsv |NN SV *dsv \
3457+
Admp |void |sv_setsv |NN SV *dsv \
34583458
|NULLOK SV *ssv
34593459
Adp |void |sv_setsv_flags |NN SV *dsv \
34603460
|NULLOK SV *ssv \

embed.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2315,6 +2315,7 @@
23152315
# define Perl_sv_insert(mTHX,a,b,c,d,e) sv_insert(a,b,c,d,e)
23162316
# define Perl_sv_mortalcopy(mTHX,a) sv_mortalcopy(a)
23172317
# define Perl_sv_pvn_force(mTHX,a,b) sv_pvn_force(a,b)
2318+
# define Perl_sv_setsv(mTHX,a,b) sv_setsv(a,b)
23182319
# define Perl_sv_taint(mTHX,a) sv_taint(a)
23192320
# define Perl_sv_unref(mTHX,a) sv_unref(a)
23202321
# define Perl_sv_usepvn(mTHX,a,b,c) sv_usepvn(a,b,c)
@@ -2369,6 +2370,7 @@
23692370
# define Perl_sv_insert sv_insert
23702371
# define Perl_sv_mortalcopy sv_mortalcopy
23712372
# define Perl_sv_pvn_force sv_pvn_force
2373+
# define Perl_sv_setsv sv_setsv
23722374
# define Perl_sv_taint sv_taint
23732375
# define Perl_sv_unref sv_unref
23742376
# define Perl_sv_usepvn sv_usepvn

mathoms.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,18 +82,6 @@ Perl_ref(pTHX_ OP *o, I32 type)
8282
return doref(o, type, TRUE);
8383
}
8484

85-
/* sv_setsv() is now a macro using Perl_sv_setsv_flags();
86-
* this function provided for binary compatibility only
87-
*/
88-
89-
void
90-
Perl_sv_setsv(pTHX_ SV *dsv, SV *ssv)
91-
{
92-
PERL_ARGS_ASSERT_SV_SETSV;
93-
94-
sv_setsv_flags(dsv, ssv, SV_GMAGIC);
95-
}
96-
9785
/*
9886
=for apidoc_section $SV
9987
=for apidoc sv_pv

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)