mirror/perl
1
0
Fork 0
mirror of https://github.com/Perl/perl5.git synced 2026-01-26 08:38:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

make RC-stack-aware: call_sv() and similar

Browse Source 
Update the functions which directly or indirectly call a CV, to handle
a reference-counted stack environment.

Note that call_sv(), eval_pv() etc are slightly unusual in that they can
be called from either a reference-counted or non-RC stack environment,
so must be able to handle either case. This is done mostly by relying on
CALLRUNOPS() to fix things up, but for anything pushed/pulled around
that, by checking rpp_stack_is_rc(): which currently always returns
false, but once ref-counting is enabled in a few commits' time, may
start returning true.
This commit is contained in:
David Mitchell 2023-01-19 13:58:03 +00:00
parent b32febe363
commit 5ff0c5f0e4
1 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
perl.c
View File

@ -2978,16 +2978,23 @@ Perl_call_argv(pTHX_ const char *sub_name, I32 flags, char **argv)
/* See G_* flags in cop.h */
/* null terminated arg list */
{
dSP;
PERL_ARGS_ASSERT_CALL_ARGV;
PUSHMARK(SP);
bool is_rc =
#if defined PERL_RC_STACK && !defined PERL_XXX_TMP_NORC
rpp_stack_is_rc();
#else
0;
#endif
PUSHMARK(PL_stack_sp);
while (*argv) {
mXPUSHs(newSVpv(*argv,0));
SV *newsv = newSVpv(*argv,0);
rpp_extend(1);
*++PL_stack_sp = newsv;
if (!is_rc)
sv_2mortal(newsv);
argv++;
}
PUTBACK;
return call_pv(sub_name, flags);
}
@ -3097,10 +3104,12 @@ Perl_call_sv(pTHX_ SV *sv, volatile I32 flags)
PL_op = (OP*)&myop;
if (!(flags & G_METHOD_NAMED)) {
dSP;
EXTEND(SP, 1);
PUSHs(sv);
PUTBACK;
rpp_extend(1);
*++PL_stack_sp = sv;
#if defined PERL_RC_STACK && !defined PERL_XXX_TMP_NORC
if (rpp_stack_is_rc())
SvREFCNT_inc_simple_void_NN(sv);
#endif
}
oldmark = TOPMARK;
@ -3195,7 +3204,12 @@ Perl_call_sv(pTHX_ SV *sv, volatile I32 flags)
}
if (flags & G_DISCARD) {
PL_stack_sp = PL_stack_base + oldmark;
#if defined PERL_RC_STACK && !defined PERL_XXX_TMP_NORC
if (rpp_stack_is_rc())
rpp_popfree_to(PL_stack_base + oldmark);
else
#endif
PL_stack_sp = PL_stack_base + oldmark;
retval = 0;
FREETMPS;
LEAVE;
@ -3364,11 +3378,16 @@ Perl_eval_pv(pTHX_ const char *p, I32 croak_on_error)
SvREFCNT_dec(sv);
}
{
dSP;
sv = POPs;
PUTBACK;
sv = *PL_stack_sp;
#if defined PERL_RC_STACK && !defined PERL_XXX_TMP_NORC
if (rpp_stack_is_rc()) {
SvREFCNT_inc_NN(sv_2mortal(sv));
rpp_popfree_1();
}
else
#endif
PL_stack_sp--;
return sv;
}