This is 0.79_54 - update META.yml, and META.json
[p5sagit/Devel-Size.git] / Size.xs
diff --git a/Size.xs b/Size.xs
index a2e30b1..e0ef024 100644 (file)
--- a/Size.xs
+++ b/Size.xs
@@ -1,3 +1,5 @@
+/* -*- mode: C -*- */
+
 #define PERL_NO_GET_CONTEXT
 
 #include "EXTERN.h"
@@ -5,6 +7,11 @@
 #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)
 #ifndef SvOOK_offset
 #  define SvOOK_offset(sv, len) STMT_START { len = SvIVX(sv); } STMT_END
 #endif
+#ifndef SvIsCOW
+#  define SvIsCOW(sv)           ((SvFLAGS(sv) & (SVf_FAKE | SVf_READONLY)) == \
+                                    (SVf_FAKE | SVf_READONLY))
+#endif
+#ifndef SvIsCOW_shared_hash
+#  define SvIsCOW_shared_hash(sv)   (SvIsCOW(sv) && SvLEN(sv) == 0)
+#endif
+#ifndef SvSHARED_HEK_FROM_PV
+#  define SvSHARED_HEK_FROM_PV(pvx) \
+        ((struct hek*)(pvx - STRUCT_OFFSET(struct hek, hek_key)))
+#endif
+
+#if PERL_VERSION < 6
+#  define PL_opargs opargs
+#  define PL_op_name op_name
+#endif
 
 #ifdef _MSC_VER 
 /* "structured exception" handling is a Microsoft extension to C and C++.
@@ -23,7 +46,7 @@
     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
@@ -110,9 +133,10 @@ check_new(struct state *st, const void *const p) {
        bits -= 8;
     } while (bits > LEAF_BITS + BYTE_BITS);
     /* bits now 16 always */
-#if !defined(MULTIPLICITY) || PERL_VERSION > 8 || (PERL_VERSION == 8 && PERL_SUBVERSION > 8)
-    /* 5.8.8 and early have an assert() macro that uses Perl_croak, hence needs
-       a my_perl under multiplicity  */
+#if PERL_COMBI_VERSION > 5008008 || (!defined(MULTIPLICITY) && !defined(USE_THREADS))
+    /* 5.8.8 and earlier have an assert() macro that uses Perl_croak, hence
+       needs a my_perl under multiplicity. Similarly, under 5.005 threads
+       Perl_croak needs a thr. In both cases, just skip the assert.  */
     assert(bits == 16);
 #endif
     leaf_p = (U8 **)tv_p;
@@ -141,7 +165,7 @@ free_tracking_at(void **tv, int level)
        /* Nodes */
        do {
            if (tv[i]) {
-               free_tracking_at(tv[i], level);
+               free_tracking_at((void **) tv[i], level);
                Safefree(tv[i]);
            }
        } while (i--);
@@ -176,7 +200,7 @@ free_state(struct state *st)
 #define SOME_RECURSION 1
 #define TOTAL_SIZE_RECURSION 2
 
-static bool sv_size(pTHX_ struct state *, const SV *const, const int recurse);
+static void sv_size(pTHX_ struct state *, const SV *const, const int recurse);
 
 typedef enum {
     OPc_NULL,   /* 0 */
@@ -191,6 +215,19 @@ typedef enum {
     OPc_PVOP,   /* 9 */
     OPc_LOOP,   /* 10 */
     OPc_COP /* 11 */
+#ifdef OA_CONDOP
+    , OPc_CONDOP /* 12 */
+#endif
+#ifdef OA_GVOP
+    , OPc_GVOP /* 13 */
+#endif
+#ifdef OA_METHOP
+    , OPc_METHOP
+#endif
+#ifdef OA_UNOP_AUX
+    , OPc_UNAUXOP
+#endif
+
 } opclass;
 
 static opclass
@@ -236,9 +273,17 @@ cc_opclass(const OP * const o)
         case OA_SVOP: TAG;
         return OPc_SVOP;
 
+#ifdef OA_PADOP
         case OA_PADOP: TAG;
         return OPc_PADOP;
+#endif
+
+#ifdef OA_GVOP
+        case OA_GVOP: TAG;
+        return OPc_GVOP;
+#endif
 
+#ifdef OA_PVOP_OR_SVOP
         case OA_PVOP_OR_SVOP: TAG;
             /*
              * Character translations (tr///) are usually a PVOP, keeping a 
@@ -249,6 +294,7 @@ cc_opclass(const OP * const o)
              */
         return (o->op_private & (OPpTRANS_TO_UTF|OPpTRANS_FROM_UTF))
             ? OPc_SVOP : OPc_PVOP;
+#endif
 
         case OA_LOOP: TAG;
         return OPc_LOOP;
@@ -298,6 +344,20 @@ cc_opclass(const OP * const o)
             return OPc_BASEOP;
         else
             return OPc_PVOP;
+
+#ifdef OA_CONDOP
+        case OA_CONDOP: TAG;
+           return OPc_CONDOP;
+#endif
+
+#ifdef OA_METHOP
+       case OA_METHOP: TAG;
+           return OPc_METHOP;
+#endif
+#ifdef OA_UNOP_AUX
+       case OA_UNOP_AUX: TAG;
+           return OPc_UNAUXOP;
+#endif
         }
         warn("Devel::Size: Can't determine class of operator %s, assuming BASEOP\n",
          PL_op_name[o->op_type]);
@@ -390,37 +450,45 @@ op_size(pTHX_ const OP * const baseop, struct state *st)
            TAG;break;
        case OPc_UNOP: TAG;
            st->total_size += sizeof(struct unop);
-           op_size(aTHX_ cUNOPx(baseop)->op_first, st);
+           op_size(aTHX_ ((UNOP *)baseop)->op_first, st);
            TAG;break;
        case OPc_BINOP: TAG;
            st->total_size += sizeof(struct binop);
-           op_size(aTHX_ cBINOPx(baseop)->op_first, st);
-           op_size(aTHX_ cBINOPx(baseop)->op_last, st);
+           op_size(aTHX_ ((BINOP *)baseop)->op_first, st);
+           op_size(aTHX_ ((BINOP *)baseop)->op_last, st);
            TAG;break;
        case OPc_LOGOP: TAG;
            st->total_size += sizeof(struct logop);
-           op_size(aTHX_ cBINOPx(baseop)->op_first, st);
-           op_size(aTHX_ cLOGOPx(baseop)->op_other, st);
+           op_size(aTHX_ ((BINOP *)baseop)->op_first, st);
+           op_size(aTHX_ ((LOGOP *)baseop)->op_other, st);
+           TAG;break;
+#ifdef OA_CONDOP
+       case OPc_CONDOP: TAG;
+           st->total_size += sizeof(struct condop);
+           op_size(aTHX_ ((BINOP *)baseop)->op_first, st);
+           op_size(aTHX_ ((CONDOP *)baseop)->op_true, st);
+           op_size(aTHX_ ((CONDOP *)baseop)->op_false, st);
            TAG;break;
+#endif
        case OPc_LISTOP: TAG;
            st->total_size += sizeof(struct listop);
-           op_size(aTHX_ cLISTOPx(baseop)->op_first, st);
-           op_size(aTHX_ cLISTOPx(baseop)->op_last, st);
+           op_size(aTHX_ ((LISTOP *)baseop)->op_first, st);
+           op_size(aTHX_ ((LISTOP *)baseop)->op_last, st);
            TAG;break;
        case OPc_PMOP: TAG;
            st->total_size += sizeof(struct pmop);
-           op_size(aTHX_ cPMOPx(baseop)->op_first, st);
-           op_size(aTHX_ cPMOPx(baseop)->op_last, st);
+           op_size(aTHX_ ((PMOP *)baseop)->op_first, st);
+           op_size(aTHX_ ((PMOP *)baseop)->op_last, st);
 #if PERL_VERSION < 9 || (PERL_VERSION == 9 && PERL_SUBVERSION < 5)
-           op_size(aTHX_ cPMOPx(baseop)->op_pmreplroot, st);
-           op_size(aTHX_ cPMOPx(baseop)->op_pmreplstart, st);
+           op_size(aTHX_ ((PMOP *)baseop)->op_pmreplroot, st);
+           op_size(aTHX_ ((PMOP *)baseop)->op_pmreplstart, st);
 #endif
            /* This is defined away in perl 5.8.x, but it is in there for
               5.6.x */
 #ifdef PM_GETRE
-           regex_size(PM_GETRE(cPMOPx(baseop)), st);
+           regex_size(PM_GETRE((PMOP *)baseop), st);
 #else
-           regex_size(cPMOPx(baseop)->op_pmregexp, st);
+           regex_size(((PMOP *)baseop)->op_pmregexp, st);
 #endif
            TAG;break;
        case OPc_SVOP: TAG;
@@ -428,22 +496,30 @@ op_size(pTHX_ const OP * const baseop, struct state *st)
            if (!(baseop->op_type == OP_AELEMFAST
                  && baseop->op_flags & OPf_SPECIAL)) {
                /* not an OP_PADAV replacement */
-               sv_size(aTHX_ st, cSVOPx(baseop)->op_sv, SOME_RECURSION);
+               sv_size(aTHX_ st, ((SVOP *)baseop)->op_sv, SOME_RECURSION);
            }
            TAG;break;
+#ifdef OA_PADOP
       case OPc_PADOP: TAG;
          st->total_size += sizeof(struct padop);
          TAG;break;
+#endif
+#ifdef OA_GVOP
+      case OPc_GVOP: TAG;
+         st->total_size += sizeof(struct gvop);
+         sv_size(aTHX_ st, ((GVOP *)baseop)->op_gv, SOME_RECURSION);
+         TAG;break;
+#endif
        case OPc_PVOP: TAG;
-           check_new_and_strlen(st, cPVOPx(baseop)->op_pv);
+           check_new_and_strlen(st, ((PVOP *)baseop)->op_pv);
            TAG;break;
        case OPc_LOOP: TAG;
            st->total_size += sizeof(struct loop);
-           op_size(aTHX_ cLOOPx(baseop)->op_first, st);
-           op_size(aTHX_ cLOOPx(baseop)->op_last, st);
-           op_size(aTHX_ cLOOPx(baseop)->op_redoop, st);
-           op_size(aTHX_ cLOOPx(baseop)->op_nextop, st);
-           op_size(aTHX_ cLOOPx(baseop)->op_lastop, st);
+           op_size(aTHX_ ((LOOP *)baseop)->op_first, st);
+           op_size(aTHX_ ((LOOP *)baseop)->op_last, st);
+           op_size(aTHX_ ((LOOP *)baseop)->op_redoop, st);
+           op_size(aTHX_ ((LOOP *)baseop)->op_nextop, st);
+           op_size(aTHX_ ((LOOP *)baseop)->op_lastop, st);
            TAG;break;
        case OPc_COP: TAG;
         {
@@ -463,14 +539,101 @@ op_size(pTHX_ const OP * const baseop, struct state *st)
 #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
 
         }
         TAG;break;
+#ifdef OA_METHOP
+       case OPc_METHOP: TAG;
+           st->total_size += sizeof(struct methop);
+           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) {
+               SV *rclass = cMETHOPx_rclass(baseop);
+               if(SvTYPE(rclass) != SVt_PVHV)
+                   sv_size(aTHX_ st, rclass, SOME_RECURSION);
+           }
+#endif
+           TAG;break;
+#endif
+#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;
+               bool last = 0;
+               bool is_hash = 0;
+               while (!last) {
+                   switch (actions & MDEREF_ACTION_MASK) {
+                       case MDEREF_reload:
+                           actions = (++items)->uv;
+                           continue;
+                       case MDEREF_HV_padhv_helem:
+                       case MDEREF_HV_gvhv_helem:
+                       case MDEREF_HV_gvsv_vivify_rv2hv_helem:
+                       case MDEREF_HV_padsv_vivify_rv2hv_helem:
+                           is_hash = 1;
+                       case MDEREF_AV_padav_aelem:
+                       case MDEREF_AV_gvav_aelem:
+                       case MDEREF_AV_gvsv_vivify_rv2av_aelem:
+                       case MDEREF_AV_padsv_vivify_rv2av_aelem:
+                           ++items;
+                           goto do_elem;
+                       case MDEREF_HV_pop_rv2hv_helem:
+                       case MDEREF_HV_vivify_rv2hv_helem:
+                           is_hash = 1;
+                       case MDEREF_AV_pop_rv2av_aelem:
+                       case MDEREF_AV_vivify_rv2av_aelem:
+                       do_elem:
+                           switch (actions & MDEREF_INDEX_MASK) {
+                               case MDEREF_INDEX_none:
+                                   last = 1;
+                                   break;
+                               case MDEREF_INDEX_const:
+                                   ++items;
+                                   if (is_hash) {
+#ifdef USE_ITHREADS
+                                       SV *key = PAD_SVl(items->pad_offset);
+#else
+                                       SV *key = items->sv;
+#endif
+                                       sv_size(aTHX_ st, key, SOME_RECURSION);
+                                   }
+                                   break;
+                               case MDEREF_INDEX_padsv:
+                               case MDEREF_INDEX_gvsv:
+                                   ++items;
+                                   break;
+                           }
+                           if (actions & MDEREF_FLAG_last)
+                               last = 1;
+                           is_hash = 0;
+                           break;
+                       default:
+                           last = 1;
+                           break;
+                   }
+                   actions >>= MDEREF_SHIFT;
+               }
+           }
+           TAG;break;
+#endif
       default:
         TAG;break;
       }
@@ -481,6 +644,29 @@ op_size(pTHX_ const OP * const baseop, struct state *st)
   }
 }
 
+static void
+hek_size(pTHX_ struct state *st, HEK *hek, U32 shared)
+{
+    /* Hash keys can be shared. Have we seen this before? */
+    if (!check_new(st, hek))
+       return;
+    st->total_size += HEK_BASESIZE + hek->hek_len
+#if PERL_VERSION < 8
+       + 1 /* No hash key flags prior to 5.8.0  */
+#else
+       + 2
+#endif
+       ;
+    if (shared) {
+#if PERL_VERSION < 10
+       st->total_size += sizeof(struct he);
+#else
+       st->total_size += STRUCT_OFFSET(struct shared_he, shared_he_hek);
+#endif
+    }
+}
+
+
 #if PERL_VERSION < 8 || PERL_SUBVERSION < 9
 #  define SVt_LAST 16
 #endif
@@ -582,23 +768,80 @@ const U8 body_sizes[SVt_LAST] = {
 #endif
 };
 
-static bool
+#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;
+    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 
+
+    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) {
   const SV *thing = orig_thing;
   U32 type;
 
   if(!check_new(st, thing))
-      return FALSE;
+      return;
 
   type = SvTYPE(thing);
   if (type > SVt_LAST) {
       warn("Devel::Size: Unknown variable type: %d encountered\n", type);
-      return TRUE;
+      return;
   }
   st->total_size += sizeof(SV) + body_sizes[type];
 
-  if (type >= SVt_PVMG) {
+  if (SvMAGICAL(thing)) {
       magic_size(aTHX_ thing, st);
   }
 
@@ -656,23 +899,59 @@ sv_size(pTHX_ struct state *const st, const SV * const orig_thing,
         cur_entry = *(HvARRAY(thing) + cur_bucket);
         while (cur_entry) {
           st->total_size += sizeof(HE);
-          if (cur_entry->hent_hek) {
-            /* Hash keys can be shared. Have we seen this before? */
-            if (check_new(st, cur_entry->hent_hek)) {
-              st->total_size += HEK_BASESIZE + cur_entry->hent_hek->hek_len + 2;
-            }
-          }
+         hek_size(aTHX_ st, cur_entry->hent_hek, HvSHAREKEYS(thing));
          if (recurse >= TOTAL_SIZE_RECURSION)
              sv_size(aTHX_ st, HeVAL(cur_entry), recurse);
           cur_entry = cur_entry->hent_next;
         }
       }
     }
+#ifdef HvAUX
+    if (SvOOK(thing)) {
+       /* This direct access is arguably "naughty": */
+       struct mro_meta *meta = HvAUX(thing)->xhv_mro_meta;
+#if PERL_VERSION > 13 || PERL_SUBVERSION > 8
+       /* As is this: */
+       I32 count = HvAUX(thing)->xhv_name_count;
+
+       if (count) {
+           HEK **names = HvAUX(thing)->xhv_name_u.xhvnameu_names;
+           if (count < 0)
+               count = -count;
+           while (--count)
+               hek_size(aTHX_ st, names[count], 1);
+       }
+       else
+#endif
+       {
+           hek_size(aTHX_ st, HvNAME_HEK(thing), 1);
+       }
+
+       st->total_size += sizeof(struct xpvhv_aux);
+       if (meta) {
+           st->total_size += sizeof(struct mro_meta);
+           sv_size(aTHX_ st, (SV *)meta->mro_nextmethod, TOTAL_SIZE_RECURSION);
+#if PERL_VERSION > 10 || (PERL_VERSION == 10 && PERL_SUBVERSION > 0)
+           sv_size(aTHX_ st, (SV *)meta->isa, TOTAL_SIZE_RECURSION);
+#endif
+#if PERL_VERSION > 10
+           sv_size(aTHX_ st, (SV *)meta->mro_linear_all, TOTAL_SIZE_RECURSION);
+           sv_size(aTHX_ st, meta->mro_linear_current, TOTAL_SIZE_RECURSION);
+#else
+           sv_size(aTHX_ st, (SV *)meta->mro_linear_dfs, TOTAL_SIZE_RECURSION);
+           sv_size(aTHX_ st, (SV *)meta->mro_linear_c3, TOTAL_SIZE_RECURSION);
+#endif
+       }
+    }
+#else
+    check_new_and_strlen(st, HvNAME_get(thing));
+#endif
     TAG;break;
 
 
   case SVt_PVFM: TAG;
-    sv_size(aTHX_ st, (SV *)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) {
@@ -685,11 +964,12 @@ sv_size(pTHX_ struct state *const st, const SV * const orig_thing,
     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);
+    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 {
+    } else if (CvROOT(thing)) {
        op_size(aTHX_ CvSTART(thing), st);
        op_size(aTHX_ CvROOT(thing), st);
     }
@@ -721,8 +1001,14 @@ sv_size(pTHX_ struct state *const st, const SV * const orig_thing,
 
   case SVt_PVGV: TAG;
     if(isGV_with_GP(thing)) {
+#ifdef GvNAME_HEK
+       hek_size(aTHX_ st, GvNAME_HEK(thing), 1);
+#else  
        st->total_size += GvNAMELEN(thing);
-#ifdef GvFILE
+#endif
+#ifdef GvFILE_HEK
+       hek_size(aTHX_ st, GvFILE_HEK(thing), 1);
+#elif defined(GvFILE)
 #  if !defined(USE_ITHREADS) || (PERL_VERSION > 8 || (PERL_VERSION == 8 && PERL_SUBVERSION > 8))
        /* With itreads, before 5.8.9, this can end up pointing to freed memory
           if the GV was created in an eval, as GvFILE() points to CopFILE(),
@@ -758,6 +1044,8 @@ sv_size(pTHX_ struct state *const st, const SV * const orig_thing,
   freescalar:
     if(recurse && SvROK(thing))
        sv_size(aTHX_ st, SvRV_const(thing), recurse);
+    else if (SvIsCOW_shared_hash(thing))
+       hek_size(aTHX_ st, SvSHARED_HEK_FROM_PV(SvPVX(thing)), 1);
     else
        st->total_size += SvLEN(thing);
 
@@ -769,7 +1057,7 @@ sv_size(pTHX_ struct state *const st, const SV * const orig_thing,
     TAG;break;
 
   }
-  return TRUE;
+  return;
 }
 
 static struct state *
@@ -789,6 +1077,9 @@ new_state(pTHX)
     check_new(st, &PL_sv_undef);
     check_new(st, &PL_sv_no);
     check_new(st, &PL_sv_yes);
+#if PERL_VERSION > 8 || (PERL_VERSION == 8 && PERL_SUBVERSION > 0)
+    check_new(st, &PL_sv_placeholder);
+#endif
     return st;
 }