Revert "Mv all Perl_save* functions from mathoms to macros"

This reverts commit 354c4cba938e53f2b7a4115e245dd49b6374b644.
This commit is contained in:
Karl Williamson 2025-04-19 16:56:49 -06:00 committed by Karl Williamson
parent 7812d46b63
commit e3f0f47eb6
5 changed files with 56 additions and 31 deletions

View File

@ -2934,10 +2934,10 @@ Cp |void |save_destructor_x \
|DESTRUCTORFUNC_t f \
|NULLOK void *p
: Used in SAVEFREOP(), used in op.c, pp_ctl.c
Cmp |void |save_freeop |NULLOK OP *o
CMbp |void |save_freeop |NULLOK OP *o
Cmp |void |save_freepv |NULLOK char *pv
Cdp |void |save_freercpv |NN char *rcpv
Cmp |void |save_freesv |NULLOK SV *sv
CMbp |void |save_freesv |NULLOK SV *sv
Cdp |void |save_generic_pvref \
|NN char **str
Cdp |void |save_generic_svref \
@ -2963,10 +2963,10 @@ Cp |void |save_I8 |NN I8 *bytep
Cp |void |save_int |NN int *intp
Adhp |void |save_item |NN SV *item
Cp |void |save_iv |NN IV *ivp
Cmp |void |save_mortalizesv \
CMbp |void |save_mortalizesv \
|NN SV *sv
: Used in SAVEFREOP(), used in gv.c, op.c, perl.c, pp_ctl.c, pp_sort.c
Cdmp |void |save_op
CMbdp |void |save_op
Cdp |void |save_padsv_and_mortalize \
|PADOFFSET off
Cp |void |save_pptr |NN char **pptr

View File

@ -625,10 +625,8 @@
# define save_delete(a,b,c) Perl_save_delete(aTHX_ a,b,c)
# define save_destructor(a,b) Perl_save_destructor(aTHX_ a,b)
# define save_destructor_x(a,b) Perl_save_destructor_x(aTHX_ a,b)
# define save_freeop(a) Perl_save_freeop(aTHX,a)
# define save_freepv(a) Perl_save_freepv(aTHX,a)
# define save_freercpv(a) Perl_save_freercpv(aTHX_ a)
# define save_freesv(a) Perl_save_freesv(aTHX,a)
# define save_generic_pvref(a) Perl_save_generic_pvref(aTHX_ a)
# define save_generic_svref(a) Perl_save_generic_svref(aTHX_ a)
# define save_gp(a,b) Perl_save_gp(aTHX_ a,b)
@ -640,8 +638,6 @@
# define save_int(a) Perl_save_int(aTHX_ a)
# define save_item(a) Perl_save_item(aTHX_ a)
# define save_iv(a) Perl_save_iv(aTHX_ a)
# define save_mortalizesv(a) Perl_save_mortalizesv(aTHX,a)
# define save_op() Perl_save_op(aTHX)
# define save_padsv_and_mortalize(a) Perl_save_padsv_and_mortalize(aTHX_ a)
# define save_pptr(a) Perl_save_pptr(aTHX_ a)
# define save_pushi32ptr(a,b,c) Perl_save_pushi32ptr(aTHX_ a,b,c)

View File

@ -135,6 +135,32 @@ Perl_sv_nounlocking(pTHX_ SV *sv)
PERL_UNUSED_ARG(sv);
}
void
Perl_save_freesv(pTHX_ SV *sv)
{
save_freesv(sv);
}
void
Perl_save_mortalizesv(pTHX_ SV *sv)
{
PERL_ARGS_ASSERT_SAVE_MORTALIZESV;
save_mortalizesv(sv);
}
void
Perl_save_freeop(pTHX_ OP *o)
{
save_freeop(o);
}
void
Perl_save_op(pTHX)
{
save_op();
}
IO *
Perl_newIO(pTHX)
{

29
proto.h generated
View File

@ -4070,9 +4070,6 @@ PERL_CALLCONV void
Perl_save_destructor_x(pTHX_ DESTRUCTORFUNC_t f, void *p);
#define PERL_ARGS_ASSERT_SAVE_DESTRUCTOR_X
/* PERL_CALLCONV void
Perl_save_freeop(pTHX_ OP *o); */
/* PERL_CALLCONV void
Perl_save_freepv(pTHX_ char *pv); */
@ -4081,9 +4078,6 @@ Perl_save_freercpv(pTHX_ char *rcpv);
#define PERL_ARGS_ASSERT_SAVE_FREERCPV \
assert(rcpv)
/* PERL_CALLCONV void
Perl_save_freesv(pTHX_ SV *sv); */
PERL_CALLCONV void
Perl_save_generic_pvref(pTHX_ char **str);
#define PERL_ARGS_ASSERT_SAVE_GENERIC_PVREF \
@ -4141,12 +4135,6 @@ Perl_save_iv(pTHX_ IV *ivp);
#define PERL_ARGS_ASSERT_SAVE_IV \
assert(ivp)
/* PERL_CALLCONV void
Perl_save_mortalizesv(pTHX_ SV *sv); */
/* PERL_CALLCONV void
Perl_save_op(pTHX); */
PERL_CALLCONV void
Perl_save_padsv_and_mortalize(pTHX_ PADOFFSET off);
#define PERL_ARGS_ASSERT_SAVE_PADSV_AND_MORTALIZE
@ -6021,6 +6009,23 @@ PERL_CALLCONV CV *
Perl_newSUB(pTHX_ I32 floor, OP *o, OP *proto, OP *block);
# define PERL_ARGS_ASSERT_NEWSUB
PERL_CALLCONV void
Perl_save_freeop(pTHX_ OP *o);
# define PERL_ARGS_ASSERT_SAVE_FREEOP
PERL_CALLCONV void
Perl_save_freesv(pTHX_ SV *sv);
# define PERL_ARGS_ASSERT_SAVE_FREESV
PERL_CALLCONV void
Perl_save_mortalizesv(pTHX_ SV *sv);
# define PERL_ARGS_ASSERT_SAVE_MORTALIZESV \
assert(sv)
PERL_CALLCONV void
Perl_save_op(pTHX);
# define PERL_ARGS_ASSERT_SAVE_OP
PERL_CALLCONV void
Perl_sv_nolocking(pTHX_ SV *sv)
__attribute__deprecated__;

20
scope.h
View File

@ -299,17 +299,15 @@ casts it to a pointer of that C<type>.
#define SSPTR(off,type) (assert(sizeof(off) >= sizeof(SSize_t)), (type) ((char*)PL_savestack + off))
#define SSPTRt(off,type) (assert(sizeof(off) >= sizeof(SSize_t)), (type*) ((char*)PL_savestack + off))
#define Perl_save_freesv(mTHX, op) \
Perl_save_pushptr(aTHX_ (void *)(op), SAVEt_FREESV)
#define Perl_save_mortalizesv(mTHX, op) \
Perl_save_pushptr(aTHX_ (void *)(op), SAVEt_MORTALIZESV)
#define save_freesv(op) save_pushptr((void *)(op), SAVEt_FREESV)
#define save_mortalizesv(op) save_pushptr((void *)(op), SAVEt_MORTALIZESV)
# define Perl_save_freeop(mTHX, op) \
STMT_START { \
OP * const _o = (OP *)(op); \
assert(!_o->op_savefree); \
_o->op_savefree = 1; \
Perl_save_pushptr(aTHX_ (void *)(_o), SAVEt_FREEOP); \
# define save_freeop(op) \
STMT_START { \
OP * const _o = (OP *)(op); \
assert(!_o->op_savefree); \
_o->op_savefree = 1; \
save_pushptr((void *)(_o), SAVEt_FREEOP); \
} STMT_END
#define Perl_save_freepv(mTHX, pv) \
Perl_save_pushptr(aTHX_ (void *)(pv), SAVEt_FREEPV)
@ -323,7 +321,7 @@ Implements C<SAVEOP>.
=cut
*/
#define Perl_save_op(mTHX) Perl_save_pushptr(aTHX_ (void *)(PL_op), SAVEt_OP)
#define save_op() save_pushptr((void *)(PL_op), SAVEt_OP)
/*
* ex: set ts=8 sts=4 sw=4 et: