X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Size.xs;h=dfd007dc0380d31ab7a7a4cbd684b77b5516b9ef;hb=ee01612f95a3434fc5c3d17e023575c8452a5a1c;hp=c66f1c681ca62e9d672383462c124afbf9f6d0ed;hpb=d0aef31a27795a784b15ae0ab68eca7f594ce109;p=p5sagit%2FDevel-Size.git

diff --git a/Size.xs b/Size.xs
index c66f1c6..dfd007d 100644
--- a/Size.xs
+++ b/Size.xs
@@ -218,6 +218,9 @@ typedef enum {
 #ifdef OA_METHOP
     , OPc_METHOP
 #endif
+#ifdef OA_UNOP_AUX
+    , OPc_UNAUXOP
+#endif
 
 } opclass;
 
@@ -345,6 +348,10 @@ cc_opclass(const OP * const o)
 	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]);
@@ -555,6 +562,69 @@ op_size(pTHX_ const OP * const baseop, struct state *st)
 #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);
+	    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;
       }
@@ -699,7 +769,7 @@ padlist_size(pTHX_ struct state *const st, const PADLIST * const padl,
     /* 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);
+    sv_size(aTHX_ st, (SV*)PadlistNAMES(padl), TOTAL_SIZE_RECURSION);
     i = PadlistMAX(padl) + 1;
     st->total_size += sizeof(PAD*) * i;
     while (--i)
@@ -851,13 +921,15 @@ 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);
-    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 if (CvROOT(thing)) {
-	op_size(aTHX_ CvSTART(thing), st);
-	op_size(aTHX_ CvROOT(thing), st);
+    } else {
+        padlist_size(aTHX_ st, CvPADLIST(thing), SOME_RECURSION);
+        if (CvROOT(thing)) {
+            op_size(aTHX_ CvSTART(thing), st);
+            op_size(aTHX_ CvROOT(thing), st);
+        }
     }
     goto freescalar;