#include "XSUB.h"
#include "ppport.h"
+#ifndef PERL_COMBI_VERSION
+#define PERL_COMBI_VERSION (PERL_REVISION * 1000000 + PERL_VERSION * 1000 + \
+ PERL_SUBVERSION)
+#endif
+
/* Not yet in ppport.h */
#ifndef CvISXSUB
# define CvISXSUB(cv) (CvXSUB(cv) ? TRUE : FALSE)
#ifdef OA_METHOP
case OPc_METHOP: TAG;
st->total_size += sizeof(struct methop);
- if (baseop->op_type != OP_METHOD)
+ if (baseop->op_type == OP_METHOD)
+ op_size(aTHX_ ((UNOP *)baseop)->op_first, st);
+ else
sv_size(aTHX_ st, cMETHOPx_meth(baseop), SOME_RECURSION);
#if PERL_VERSION*1000+PERL_SUBVERSION >= 21007
if (baseop->op_type == OP_METHOD_REDIR || baseop->op_type == OP_METHOD_REDIR_SUPER) {
#ifdef OA_UNOP_AUX
case OPc_UNAUXOP: TAG;
st->total_size += sizeof(struct unop_aux) + sizeof(UNOP_AUX_item) * (cUNOP_AUXx(baseop)->op_aux[-1].uv+1);
+ op_size(aTHX_ ((UNOP *)baseop)->op_first, st);
if (baseop->op_type == OP_MULTIDEREF) {
UNOP_AUX_item *items = cUNOP_AUXx(baseop)->op_aux;
UV actions = items->uv;
#endif
};
-#ifdef PadlistNAMES
+#if PERL_COMBI_VERSION < 5008001
+typedef AV PADLIST;
+#endif
+
static void
padlist_size(pTHX_ struct state *const st, const PADLIST * const padl,
const int recurse) {
+
+#if PERL_VERSION*1000+PERL_SUBVERSION >= 21007
+/* This is, as ever, excessively nosey with the implementation, and hence
+ fragile. */
+ SSize_t i;
+ const PADNAMELIST *pnl;
+
+ if (!check_new(st, padl))
+ return;
+ st->total_size += sizeof(PADLIST);
+
+ st->total_size += sizeof(PADNAMELIST);
+ pnl = PadlistNAMES(padl);
+ st->total_size += pnl->xpadnl_max * sizeof(PADNAME *);
+ i = PadnamelistMAX(pnl) + 1;
+ while (--i) {
+ const PADNAME *const pn =
+ PadnamelistARRAY(pnl)[i];
+ if (!pn || pn == &PL_padname_undef || pn == &PL_padname_const)
+ continue;
+ if (!check_new(st, pn))
+ continue;
+ st->total_size += STRUCT_OFFSET(struct padname_with_str, xpadn_str[0])
+ + PadnameLEN(pn) + 1;
+ }
+
+ i = PadlistMAX(padl) + 1;
+ st->total_size += sizeof(PAD*) * i;
+ while (--i)
+ sv_size(aTHX_ st, (SV*)PadlistARRAY(padl)[i], recurse);
+
+#elif defined PadlistNAMES
+
SSize_t i;
if (!check_new(st, padl))
return;
- /* This relies on PADNAMELIST and PAD being typedefed to AV. If that
- ever changes, this code will need an update. */
st->total_size += sizeof(PADLIST);
sv_size(aTHX_ st, (SV*)PadlistNAMES(padl), TOTAL_SIZE_RECURSION);
i = PadlistMAX(padl) + 1;
st->total_size += sizeof(PAD*) * i;
while (--i)
sv_size(aTHX_ st, (SV*)PadlistARRAY(padl)[i], recurse);
-}
+
#else
-static void
-padlist_size(pTHX_ struct state *const st, const AV * const padl,
- const int recurse) {
+
sv_size(aTHX_ st, (SV*)padl, recurse);
-}
+
#endif
+}
static void
sv_size(pTHX_ struct state *const st, const SV * const orig_thing,
case SVt_PVFM: TAG;
- padlist_size(aTHX_ st, CvPADLIST(thing), SOME_RECURSION);
+ if (PERL_VERSION*1000+PERL_SUBVERSION < 21006 || !CvISXSUB(thing))
+ padlist_size(aTHX_ st, CvPADLIST(thing), SOME_RECURSION);
sv_size(aTHX_ st, (SV *)CvOUTSIDE(thing), recurse);
if (st->go_yell && !st->fm_whine) {
sv_size(aTHX_ st, (SV *)CvSTASH(thing), SOME_RECURSION);
sv_size(aTHX_ st, (SV *)SvSTASH(thing), SOME_RECURSION);
sv_size(aTHX_ st, (SV *)CvGV(thing), SOME_RECURSION);
+ if (PERL_VERSION*1000+PERL_SUBVERSION < 21006 || !CvISXSUB(thing))
+ padlist_size(aTHX_ st, CvPADLIST(thing), SOME_RECURSION);
sv_size(aTHX_ st, (SV *)CvOUTSIDE(thing), recurse);
if (CvISXSUB(thing)) {
sv_size(aTHX_ st, cv_const_sv((CV *)thing), recurse);
- } else {
- padlist_size(aTHX_ st, CvPADLIST(thing), SOME_RECURSION);
- if (CvROOT(thing)) {
- op_size(aTHX_ CvSTART(thing), st);
- op_size(aTHX_ CvROOT(thing), st);
- }
+ } else if (CvROOT(thing)) {
+ op_size(aTHX_ CvSTART(thing), st);
+ op_size(aTHX_ CvROOT(thing), st);
}
goto freescalar;