functionality on other platforms. */
# include <excpt.h>
# define TRY_TO_CATCH_SEGV __try
-# define CAUGHT_EXCEPTION __except(EXCEPTION EXCEPTION_EXECUTE_HANDLER)
+# define CAUGHT_EXCEPTION __except(EXCEPTION_EXECUTE_HANDLER)
#else
# define TRY_TO_CATCH_SEGV if(1)
# define CAUGHT_EXCEPTION else
#endif
#ifdef USE_ITHREADS
check_new_and_strlen(st, basecop->cop_file);
+#if PERL_VERSION < 17 || (PERL_VERSION == 17 && PERL_SUBVERSION == 0)
+ /* This pointer is owned by the COP, and freed with it. */
check_new_and_strlen(st, basecop->cop_stashpv);
#else
- sv_size(aTHX_ st, (SV *)basecop->cop_stash, SOME_RECURSION);
+ /* A per-interpreter pointer for this stash is allocated in
+ PL_stashpad. */
+ if (check_new(st, PL_stashpad + basecop->cop_stashoff))
+ st->total_size += sizeof(PL_stashpad[basecop->cop_stashoff]);
+#endif
+#else
sv_size(aTHX_ st, (SV *)basecop->cop_filegv, SOME_RECURSION);
#endif
#endif
};
+#ifdef PadlistNAMES
+static void
+padlist_size(pTHX_ struct state *const st, const PADLIST * const padl,
+ const int recurse) {
+ 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), recurse);
+ 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,
const int recurse) {
}
st->total_size += sizeof(SV) + body_sizes[type];
- if (type >= SVt_PVMG) {
+ if (SvMAGICAL(thing)) {
magic_size(aTHX_ thing, st);
}
case SVt_PVFM: TAG;
- sv_size(aTHX_ st, (SV *)CvPADLIST(thing), SOME_RECURSION);
+ 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);
- sv_size(aTHX_ st, (SV *)CvPADLIST(thing), SOME_RECURSION);
+ 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 {
+ } else if (CvROOT(thing)) {
op_size(aTHX_ CvSTART(thing), st);
op_size(aTHX_ CvROOT(thing), st);
}